mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-06 14:05:32 +00:00
ICU-2194 fix seg fault on CCC
X-SVN-Rev: 11323
This commit is contained in:
parent
b89a8122f2
commit
b44e07e7b1
2 changed files with 8 additions and 7 deletions
|
@ -187,7 +187,7 @@ caseMapLineFn(void *context,
|
|||
UBool* mapWithNorm = (UBool*) context;
|
||||
|
||||
/* ignore First and Last entries for ranges */
|
||||
if( *fields[1][0]=='<' &&
|
||||
if( fields[1][0] != NULL && *fields[1][0]=='<' &&
|
||||
(length=(int32_t)(fields[1][1]-fields[1][0]))>=9 &&
|
||||
(0==uprv_memcmp(", First>", fields[1][1]-8, 8) || 0==uprv_memcmp(", Last>", fields[1][1]-7, 7))
|
||||
) {
|
||||
|
@ -237,14 +237,15 @@ unicodeDataLineFn(void *context,
|
|||
uint32_t rangeStart=0,rangeEnd =0;
|
||||
UBool* isUnassigned = (UBool*) context;
|
||||
|
||||
/* ignore First and Last entries for ranges
|
||||
if( *fields[1][0]=='<' &&
|
||||
|
||||
/* ignore First and Last entries for ranges */
|
||||
if( fields[1][0] != NULL && *fields[1][0]=='<' &&
|
||||
(length=(int32_t)(fields[1][1]-fields[1][0]))>=9 &&
|
||||
(0==uprv_memcmp(", First>", fields[1][1]-8, 8) || 0==uprv_memcmp(", Last>", fields[1][1]-7, 7))
|
||||
) {
|
||||
return;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
u_parseCodePointRange(fields[0][0], &rangeStart,&rangeEnd, pErrorCode);
|
||||
|
||||
|
|
|
@ -258,7 +258,7 @@ normalizationCorrectionsLineFn(void *context,
|
|||
UVersionInfo thisVersion;
|
||||
|
||||
/* ignore First and Last entries for ranges */
|
||||
if( *fields[1][0]=='<' &&
|
||||
if( fields[1][0] != NULL && *fields[1][0]=='<' &&
|
||||
(length=(int32_t)(fields[1][1]-fields[1][0]))>=9 &&
|
||||
(0==uprv_memcmp(", First>", fields[1][1]-8, 8) || 0==uprv_memcmp(", Last>", fields[1][1]-7, 7))
|
||||
) {
|
||||
|
@ -330,7 +330,7 @@ caseMapLineFn(void *context,
|
|||
UBool* mapWithNorm = (UBool*) context;
|
||||
|
||||
/* ignore First and Last entries for ranges */
|
||||
if( *fields[1][0]=='<' &&
|
||||
if( fields[1][0] != NULL && *fields[1][0]=='<' &&
|
||||
(length=(int32_t)(fields[1][1]-fields[1][0]))>=9 &&
|
||||
(0==uprv_memcmp(", First>", fields[1][1]-8, 8) || 0==uprv_memcmp(", Last>", fields[1][1]-7, 7))
|
||||
) {
|
||||
|
@ -446,7 +446,7 @@ unicodeDataLineFn(void *context,
|
|||
UBool* isUnassigned = (UBool*) context;
|
||||
|
||||
/* ignore First and Last entries for ranges */
|
||||
if( *fields[1][0]=='<' &&
|
||||
if( fields[1][0] != NULL && *fields[1][0]=='<' &&
|
||||
(length=(int32_t)(fields[1][1]-fields[1][0]))>=9 &&
|
||||
(0==uprv_memcmp(", First>", fields[1][1]-8, 8) || 0==uprv_memcmp(", Last>", fields[1][1]-7, 7))
|
||||
) {
|
||||
|
|
Loading…
Add table
Reference in a new issue