X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/b04fe171f0375ecd5d8a24747ca1dff85720a0ca..84aacf34eae6543be9f0280b2015385f91e5c2c6:/OSX/libsecurity_cdsa_utils/lib/cuOidParser.cpp?ds=sidebyside diff --git a/OSX/libsecurity_cdsa_utils/lib/cuOidParser.cpp b/OSX/libsecurity_cdsa_utils/lib/cuOidParser.cpp index d52276b6..d490d0f8 100644 --- a/OSX/libsecurity_cdsa_utils/lib/cuOidParser.cpp +++ b/OSX/libsecurity_cdsa_utils/lib/cuOidParser.cpp @@ -37,7 +37,7 @@ /* get config file from .. or from . */ #define CONFIG_FILE_NAME "dumpasn1.cfg" -static const char *CONFIG_FILE1 = "../"CONFIG_FILE_NAME; +static const char *CONFIG_FILE1 = "../" CONFIG_FILE_NAME; static const char *CONFIG_FILE2 = CONFIG_FILE_NAME; /* or from here via getenv */ #define CONFIG_FILE_ENV "LOCAL_BUILD_DIR" @@ -56,7 +56,7 @@ int readFileExtra( { int rtn; int fd; - unsigned char *buf; + unsigned char *buf = NULL; struct stat sb; size_t size; @@ -76,12 +76,9 @@ int readFileExtra( rtn = ENOMEM; goto errOut; } - rtn = (int)lseek(fd, 0, SEEK_SET); - if(rtn < 0) { - goto errOut; - } rtn = (int)read(fd, buf, (size_t)size); if(rtn != (int)size) { + free(buf); if(rtn >= 0) { printf("readFile: short read\n"); }