ICU-22884 Fix assertion and Heap-use-after-free

Issue in icu_76::message2::MessageFormatter::~MessageFormatter
unicode-org · Sep 12, 2024 · fd8a552 · fd8a552
1 parent 923d02f
commit fd8a552
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/icu4c/source/i18n/messageformat2_data_model.cpp b/icu4c/source/i18n/messageformat2_data_model.cpp
@@ -281,6 +281,10 @@ OptionMap::OptionMap(const UVector& opts, UErrorCode& status) : len(opts.size())
 
 OptionMap::OptionMap(const OptionMap& other) : len(other.len) {
     U_ASSERT(!other.bogus);
+    if (len == 0) {
+        bogus = false;
+        return;
+    }
     UErrorCode localErrorCode = U_ZERO_ERROR;
     Option* result = copyArray(other.options.getAlias(), len, localErrorCode);
     if (U_FAILURE(localErrorCode)) {

diff --git a/icu4c/source/i18n/messageformat2_formatter.cpp b/icu4c/source/i18n/messageformat2_formatter.cpp
@@ -150,6 +150,7 @@ namespace message2 {
     void MessageFormatter::cleanup() noexcept {
         if (errors != nullptr) {
             delete errors;
+            errors = nullptr;
         }
     }