ICU-21268 Adds NULL string checks to assert statements to prevent
segmentation faults when unit tests run without ICU data.
ICU-21268 Fix value type: char* is not ompatible with u'..' value.
diff --git a/icu4c/source/test/cintltst/cintltst.c b/icu4c/source/test/cintltst/cintltst.c
index 4983613..b4364a6 100644
--- a/icu4c/source/test/cintltst/cintltst.c
+++ b/icu4c/source/test/cintltst/cintltst.c
@@ -696,6 +696,12 @@
U_CFUNC UBool assertEquals(const char* message, const char* expected,
const char* actual) {
+ if (expected == NULL) {
+ expected = "(null)";
+ }
+ if (actual == NULL) {
+ actual = "(null)";
+ }
if (uprv_strcmp(expected, actual) != 0) {
log_err("FAIL: %s; got \"%s\"; expected \"%s\"\n",
message, actual, expected);
@@ -711,6 +717,12 @@
U_CFUNC UBool assertUEquals(const char* message, const UChar* expected,
const UChar* actual) {
+ if (expected == NULL) {
+ expected = u"(null)";
+ }
+ if (actual == NULL) {
+ actual = u"(null)";
+ }
for (int32_t i=0;; i++) {
if (expected[i] != actual[i]) {
log_err("FAIL: %s; got \"%s\"; expected \"%s\"\n",
