commit 43f2ae75ca9f70475f0c36e0c3edfb48b568dcbc
author Frank Tang <ftang@chromium.org> Fri Jun 24 16:43:55 2022 -0700
committer Frank Yung-Fong Tang <ftang@google.com> Fri Jun 24 18:00:03 2022 -0700
tree 8e486672184faf7753fdca3ac821a798f44d29be
parent 86cc2b98cbf694074cfe951467cc373d26fa9df2

ICU-22004 Avoid UBSan bug by casting only when success

icu4c/source/i18n/ulocdata.cpp

diff --git a/icu4c/source/i18n/ulocdata.cpp b/icu4c/source/i18n/ulocdata.cpp
index 68b9e0c..c7eb8c3 100644
--- a/icu4c/source/i18n/ulocdata.cpp
+++ b/icu4c/source/i18n/ulocdata.cpp
@@ -230,7 +230,10 @@ ulocdata_getMeasurementSystem(const char *localeID, UErrorCode *status){
     }
 
     measurement = measurementTypeBundleForLocale(localeID, MEASUREMENT_SYSTEM, status);
-    system = (UMeasurementSystem) ures_getInt(measurement, status);
+    int32_t result = ures_getInt(measurement, status);
+    if (U_SUCCESS(*status)) {
+         system = static_cast<UMeasurementSystem>(result);
+    }
 
     ures_close(measurement);