ICU-1245 some fixes

X-SVN-Rev: 6009
This commit is contained in:
Vladimir Weinstein 2001-10-03 05:58:10 +00:00
parent e76f47fb7f
commit b1598b4a14
2 changed files with 4 additions and 3 deletions

View file

@ -378,7 +378,8 @@ U_CFUNC uint32_t ucol_getCEGenerator(ucolCEGenerator *g, uint32_t* lows, uint32_
low = UCOL_COMMON_TOP2<<24;
high = 0xFFFFFFFF;
} else {
low = 0x02000000;
//low = 0x02000000; // This needs to be checked - what if low is
// not good...
high = 0x40000000;
}
break;

View file

@ -44,7 +44,7 @@ void ucol_tok_initTokenList(UColTokenParser *src, const UChar *rules, const uint
src->end = src->source+nSize;
src->sourceCurrent = src->source;
src->extraCurrent = src->end;
src->extraEnd = src->end+UCOL_TOK_EXTRA_RULE_SPACE_SIZE;
src->extraEnd = src->source+estimatedSize; //src->end+UCOL_TOK_EXTRA_RULE_SPACE_SIZE;
src->UCA = UCA;
src->invUCA = ucol_initInverseUCA(status);
src->resultLen = 0;
@ -594,7 +594,7 @@ const UChar *ucol_tok_parseNextToken(UColTokenParser *src,
if(ch != 0x27) {
*src->extraCurrent++ = ch;
}
if(src->extraCurrent == src->extraEnd) {
if(src->extraCurrent > src->extraEnd) {
/* reallocate */
UChar *newSrc = (UChar *)uprv_realloc(src->source, (src->extraEnd-src->source)*2*sizeof(UChar));
if(newSrc != NULL) {