ICU-23062 Added null check in one spot in genrb where we know we've seen crashes.

richgillam · markusicu · commit faa80a297236 · 2025-03-06T17:50:59.000Z
diff --git a/icu4c/source/tools/genrb/parse.cpp b/icu4c/source/tools/genrb/parse.cpp
@@ -297,7 +297,7 @@ static char *getInvariantString(ParseState* state, uint32_t *line, struct UStrin
 
     if(!uprv_isInvariantUString(tokenValue->fChars, tokenValue->fLength)) {
         *status = U_INVALID_FORMAT_ERROR;
-        error(*line, "invariant characters required for table keys, binary data, etc.");
+        error((line == nullptr) ? 0 : *line, "invariant characters required for table keys, binary data, etc.");
         return nullptr;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ static char getInvariantString(ParseState state, uint32_t *line, struct UStrin`
`297`	`297`
`298`	`298`	`if(!uprv_isInvariantUString(tokenValue->fChars, tokenValue->fLength)) {`
`299`	`299`	`*status = U_INVALID_FORMAT_ERROR;`
`300`		`- error(*line, "invariant characters required for table keys, binary data, etc.");`
	`300`	`+ error((line == nullptr) ? 0 : *line, "invariant characters required for table keys, binary data, etc.");`
`301`	`301`	`return nullptr;`
`302`	`302`	`}`
`303`	`303`