From 7ca01d0e0b63a6f36eeba3075f69a803536194c2 Mon Sep 17 00:00:00 2001 From: Ram Viswanadha Date: Wed, 31 Jul 2002 21:00:28 +0000 Subject: [PATCH] ICU-1878 fix for crash of ISO-2022-CN converter on illegal input X-SVN-Rev: 9474 --- icu4c/source/common/ucnv2022.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/icu4c/source/common/ucnv2022.c b/icu4c/source/common/ucnv2022.c index 12ece4d2f10..04eaa7fcd93 100644 --- a/icu4c/source/common/ucnv2022.c +++ b/icu4c/source/common/ucnv2022.c @@ -3136,7 +3136,12 @@ UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC(UConverterToUnicodeArgs *args, mySourceChar+= (uint32_t) args->converter->toUnicodeStatus<<8; args->converter->toUnicodeStatus = 0; pBuf = tempBuf; - targetUniChar = _MBCSSimpleGetNextUChar(myData->currentConverter->sharedData, &pBuf, tempLimit, FALSE); + if(myData->currentConverter!=NULL){ + targetUniChar = _MBCSSimpleGetNextUChar(myData->currentConverter->sharedData, &pBuf, tempLimit, FALSE); + }else{ + *err=U_INVALID_CHAR_FOUND; + break; + } } } else{