ICU 56 update step 1

source/tools/toolutil/flagparser.c

 /******************************************************************************
- *   Copyright (C) 2009-2012, International Business Machines
+ *   Copyright (C) 2009-2015, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
 
 #include "flagparser.h"
 #include "filestrm.h"
 #include "cstring.h"
 #include "cmemory.h"
 
 #define DEFAULT_BUFFER_SIZE 512
 
 static int32_t currentBufferSize = DEFAULT_BUFFER_SIZE;
 
 static int32_t extractFlag(char* buffer, int32_t bufferSize, char* flag, int32_t flagSize, const char ** flagNames, int32_t numOfFlags, UErrorCode *status);
 static int32_t getFlagOffset(const char *buffer, int32_t bufferSize);
 
 /*
  * Opens the given fileName and reads in the information storing the data in flagBuffer.
  */
 U_CAPI int32_t U_EXPORT2
 parseFlagsFile(const char *fileName, char **flagBuffer, int32_t flagBufferSize, const char ** flagNames, int32_t numOfFlags, UErrorCode *status) {
-    char* buffer = uprv_malloc(sizeof(char) * currentBufferSize);
-    char* tmpFlagBuffer = uprv_malloc(sizeof(char) * flagBufferSize);
+    char* buffer = NULL;
+    char* tmpFlagBuffer = NULL;
     UBool allocateMoreSpace = FALSE;
     int32_t idx, i;
     int32_t result = 0;
 
     FileStream *f = T_FileStream_open(fileName, "r");
     if (f == NULL) {
         *status = U_FILE_ACCESS_ERROR;
-        return -1;
+        goto parseFlagsFile_cleanup;
     }
+    
+    buffer = uprv_malloc(sizeof(char) * currentBufferSize);
+    tmpFlagBuffer = uprv_malloc(sizeof(char) * flagBufferSize);
 
-    if (buffer == NULL) {
+    if (buffer == NULL || tmpFlagBuffer == NULL) {
         *status = U_MEMORY_ALLOCATION_ERROR;
-        return -1;
+        goto parseFlagsFile_cleanup;
     }
 
     do {
         if (allocateMoreSpace) {
             allocateMoreSpace = FALSE;
             currentBufferSize *= 2;
             uprv_free(buffer);
             buffer = uprv_malloc(sizeof(char) * currentBufferSize);
             if (buffer == NULL) {
-                uprv_free(tmpFlagBuffer);
                 *status = U_MEMORY_ALLOCATION_ERROR;
-                return -1;
+                goto parseFlagsFile_cleanup;
             }
         }
         for (i = 0; i < numOfFlags;) {
             if (T_FileStream_readLine(f, buffer, currentBufferSize) == NULL) {
                 /* End of file reached. */
                 break;
             }
             if (buffer[0] == '#') {
                 continue;
             }
@@ skipping 21 matching lines @@
                             continue;
                         }
                     } else {
                         uprv_strcpy(flagBuffer[i++], tmpFlagBuffer);
                     }
                 }
             }
         }
     } while (allocateMoreSpace && U_SUCCESS(*status));
 
+parseFlagsFile_cleanup:
     uprv_free(tmpFlagBuffer);
     uprv_free(buffer);
 
     T_FileStream_close(f);
+    
+    if (U_FAILURE(*status)) {
+        return -1;
+    }
 
     if (U_SUCCESS(*status) && result == 0) {
         currentBufferSize = DEFAULT_BUFFER_SIZE;
     }
 
     return result;
 }
 
 
 /*
@@ skipping 56 matching lines @@
             break;
         }
     }
 
     if (offset == bufferSize || (offset - 1) == bufferSize) {
         offset = 0;
     }
 
     return offset;
 }