ICU-12566 Fix null strlen check

X-SVN-Rev: 38885
This commit is contained in:
Michael Ow 2016-06-26 21:08:16 +00:00
parent f2f790a6c5
commit 0402053377

View file

@ -203,7 +203,7 @@ main(int argc, char* argv[]) {
#else
setUnicodeVersion(options[UNICODE_VERSION].value);
filename = (char* ) uprv_malloc(uprv_strlen(srcDir) + uprv_strlen(inputFileName) + 20); /* hopefully this should be enough */
filename = (char* ) uprv_malloc(uprv_strlen(srcDir) + uprv_strlen(inputFileName) + (icuUniDataDir == NULL ? 0 : uprv_strlen(icuUniDataDir)) + 40); /* hopefully this should be enough */
/* prepare the filename beginning with the source dir */
if(uprv_strchr(srcDir,U_FILE_SEP_CHAR) == NULL && uprv_strchr(srcDir,U_FILE_ALT_SEP_CHAR) == NULL){