commit b6ff1393d5ddf2e405d6a78da53bcda76a7b6b80
author gnrunge <nrunge@google.com> Thu Sep 03 16:28:38 2020 -0700
committer Norbert Runge <41129501+gnrunge@users.noreply.github.com> Tue Sep 08 18:22:29 2020 -0700
tree 8683d8c6272601319bdedaa87c9b4412a36c58f7
parent 2361a3258b6bbadc8c3e97191f236619f72a8223

ICU-21268 Add error checks to avoid segmentation faults if tests run with stubdata only.

ICU-21268 Use 'nullptr' instead of NULL when checking for pointer value.

ICU-21268: Fixes error message.

ICU-21268 Style fixes (space before '{').

icu4c/source/test/intltest/dtfmttst.cpp

diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp
index fc0a5f6..3bd5136 100644
--- a/icu4c/source/test/intltest/dtfmttst.cpp
+++ b/icu4c/source/test/intltest/dtfmttst.cpp
@@ -3478,6 +3478,7 @@
         UnicodeString actual;
 
         SimpleDateFormat smptfmt("Z", locale, status);
+        ASSERT_OK(status);
         assertEquals("TimeZone from SimpleDateFormat constructor",
                      expectedTimezone, smptfmt.getTimeZone().getID(actual));
         assertEquals("Calendar from SimpleDateFormat constructor",
@@ -3485,13 +3486,20 @@
 
         LocalPointer<DateFormat> datefmt(
                 DateFormat::createDateInstance(DateFormat::kDefault, locale));
+        if (datefmt == nullptr) {
+            dataerrln("Error calling DateFormat::createDateInstance()");
+            return;
+        }
         assertEquals("TimeZone from DateFormat::createDateInstance",
                      expectedTimezone, datefmt->getTimeZone().getID(actual));
         assertEquals("Calendar from DateFormat::createDateInstance",
                      testLine[2], datefmt->getCalendar()->getType());
-
         LocalPointer<DateFormat> timefmt(
                 DateFormat::createTimeInstance(DateFormat::kDefault, locale));
+        if (timefmt == nullptr) {
+            dataerrln("Error calling DateFormat::createTimeInstance()");
+            return;
+        }
         assertEquals("TimeZone from TimeFormat::createTimeInstance",
                      expectedTimezone, timefmt->getTimeZone().getID(actual));
         assertEquals("Calendar from DateFormat::createTimeInstance",
@@ -3500,6 +3508,10 @@
         LocalPointer<DateFormat> datetimefmt(
                 DateFormat::createDateTimeInstance(
                     DateFormat::kDefault, DateFormat::kDefault, locale));
+        if (datetimefmt == nullptr) {
+            dataerrln("Error calling DateFormat::createDateTimeInstance()");
+            return;
+        }
         assertEquals("TimeZone from DateTimeFormat::createDateTimeInstance",
                      expectedTimezone, datetimefmt->getTimeZone().getID(actual));
         assertEquals("Calendar from DateFormat::createDateTimeInstance",

icu4c/source/test/intltest/numfmtst.cpp

diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp
index 3be453f..86e1032 100644
--- a/icu4c/source/test/intltest/numfmtst.cpp
+++ b/icu4c/source/test/intltest/numfmtst.cpp
@@ -10013,7 +10013,13 @@
         ParsePosition ppos;
 
         DecimalFormatSymbols dfs(Locale::getEnglish(), status);
+        if (status.errDataIfFailureAndReset()) {
+            return;
+        }
         DecimalFormat df(patternString, dfs, status);
+        if (status.errDataIfFailureAndReset()) {
+            return;
+        }
         df.setLenient(FALSE);
         LocalPointer<CurrencyAmount> ca_strict(df.parseCurrency(inputString, ppos));
         if (ca_strict != nullptr) {