ICU-8.11.1.tar.gz

[apple/icu.git] / icuSources / tools / genrb / reslist.c

diff --git a/icuSources/tools/genrb/reslist.c b/icuSources/tools/genrb/reslist.c
index 32b4593707956a6f006d0b09cbb98b0b2ca44a08..9f30ca9c10869576dff07b5e92c3feb9011c6b58 100644 (file)
--- a/icuSources/tools/genrb/reslist.c
+++ b/icuSources/tools/genrb/reslist.c
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2000-2004, International Business Machines
+*   Copyright (C) 2000-2006, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -40,7 +40,7 @@ static const UDataInfo dataInfo= {
     0,
 
     {0x52, 0x65, 0x73, 0x42},     /* dataFormat="resb" */
-    {1, 1, 0, 0},                 /* formatVersion */
+    {1, 2, 0, 0},                 /* formatVersion */
     {1, 4, 0, 0}                  /* dataVersion take a look at version inside parsed resb*/
 };
 
@@ -393,12 +393,22 @@ void bundle_write(struct SRBRoot *bundle, const char *outputDir, const char *out
      * write int32_t indexes[] after root and before the strings
      * to make it easier to parse resource bundles in icuswap or from Java etc.
      */
+    uprv_memset(indexes, 0, sizeof(indexes));
     indexes[URES_INDEX_LENGTH]=             URES_INDEX_TOP;
     indexes[URES_INDEX_STRINGS_TOP]=        (int32_t)(usedOffset>>2);
     indexes[URES_INDEX_RESOURCES_TOP]=      (int32_t)(top>>2);
     indexes[URES_INDEX_BUNDLE_TOP]=         indexes[URES_INDEX_RESOURCES_TOP];
     indexes[URES_INDEX_MAX_TABLE_LENGTH]=   bundle->fMaxTableLength;
 
+    /*
+     * formatVersion 1.2 (ICU 3.6):
+     * write indexes[URES_INDEX_ATTRIBUTES] with URES_ATT_NO_FALLBACK set or not set
+     * the memset() above initialized all indexes[] to 0
+     */
+    if(bundle->noFallback) {
+        indexes[URES_INDEX_ATTRIBUTES]=URES_ATT_NO_FALLBACK;
+    }
+
     /* write the indexes[] */
     udata_writeBlock(mem, indexes, sizeof(indexes));
 
@@ -441,6 +451,7 @@ struct SResource* res_open(const struct UString* comment, UErrorCode* status){
         res->fComment = (struct UString *) uprv_malloc(sizeof(struct UString));
         if(res->fComment == NULL){
             *status = U_MEMORY_ALLOCATION_ERROR;
+            uprv_free(res);
             return NULL;
         }
         ustr_init(res->fComment);
@@ -478,7 +489,7 @@ struct SResource* table_open(struct SRBRoot *bundle, char *tag,  const struct US
     return res;
 }
 
-struct SResource* array_open(struct SRBRoot *bundle, char *tag, const struct UString* comment, UErrorCode *status) {
+struct SResource* array_open(struct SRBRoot *bundle, const char *tag, const struct UString* comment, UErrorCode *status) {
 
     struct SResource *res = res_open(comment, status);
 
@@ -743,9 +754,12 @@ void table_close(struct SResource *table, UErrorCode *status) {
 void array_close(struct SResource *array, UErrorCode *status) {
     struct SResource *current = NULL;
     struct SResource *prev    = NULL;
-
+    
+    if(array==NULL){
+        return;
+    }
     current = array->u.fArray.fFirst;
-
+    
     while (current != NULL) {
         prev    = current;
         current = current->fNext;