organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-312 don't pass a null converter to ucnv_reset()!

Browse source 
X-SVN-Rev: 1107
This commit is contained in:
Yves Arrouye 2000-04-10 23:26:18 +00:00
parent 8b0bee3da5
commit 6ae72bf76b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icu4c/source/common/unistr.cpp
View file

@ -205,7 +205,8 @@ UnicodeString::UnicodeString(const char *codepageData,
}
UnicodeString::UnicodeString(const UnicodeString& that)
: fArray(fStackBuffer),
: Replaceable(),
fArray(fStackBuffer),
fLength(0),
fCapacity(US_STACKBUF_SIZE),
fHashCode(kEmptyHashCode),
@ -1147,10 +1148,7 @@ UnicodeString::extract(UTextOffset start,
// pin the indices to legal values
pinIndices(start, length);
int32_t convertedLen = 0;
// set up the conversion parameters
int32_t sourceLen = length;
const UChar *mySource = getArrayStart() + start;
const UChar *mySourceEnd = mySource + length;
char *myTarget = dst;
@ -1456,7 +1454,9 @@ void
UnicodeString::releaseDefaultConverter(UConverter *converter)
{
if(fgDefaultConverter == 0) {
ucnv_reset(converter);
if (converter != 0) {
ucnv_reset(converter);
}
Mutex lock;