ICU-22903 Svace: Check values for NULL before access

unicode-org · Sep 20, 2024 · f8b5fd8 · f8b5fd8
1 parent b3bf9f8
commit f8b5fd8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/icu4c/source/common/utrie2.cpp b/icu4c/source/common/utrie2.cpp
@@ -574,7 +574,15 @@ enumEitherTrie(const UTrie2 *trie,
                     c+=UTRIE2_DATA_BLOCK_LENGTH;
                 } else {
                     for(j=0; j<UTRIE2_DATA_BLOCK_LENGTH; ++j) {
-                        value=enumValue(context, data32!=nullptr ? data32[block+j] : idx[block+j]);
+                        if (data32!=nullptr) {
+                            value=enumValue(context, data32[block+j]);
+                        } else if (idx!=nullptr) {
+                            value=enumValue(context, idx[block+j]);
+                        } else {
+                            /* data32 and idx are not supposed to be NULL at the same time */
+                            U_ASSERT(false);
+                            return;
+                        }
                         if(value!=prevValue) {
                             if(prev<c && !enumRange(context, prev, c-1, prevValue)) {
                                 return;

diff --git a/icu4c/source/i18n/unum.cpp b/icu4c/source/i18n/unum.cpp
@@ -177,7 +177,9 @@ unum_clone(const UNumberFormat *fmt,
     } else {
         const RuleBasedNumberFormat* rbnf = dynamic_cast<const RuleBasedNumberFormat*>(nf);
         U_ASSERT(rbnf != nullptr);
-        res = rbnf->clone();
+        if (rbnf != nullptr) {
+            res = rbnf->clone();
+        }
     }
 
     if (res == nullptr) {