AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-96 fix for crash on AS400 due to negative pointer value

Browse Source 
X-SVN-Rev: 4307
This commit is contained in:
Vladimir Weinstein 2001-03-23 07:48:40 +00:00
parent e78887dc1f
commit f182a3214f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/i18n/ucol.cpp
View File

@ -1446,7 +1446,6 @@ ucol_calcSortKey(const UCollator *coll,
primaries = *result = prim;
resultLength = UCOL_PRIMARY_MAX_BUFFER;
}
uint8_t *primarySafeEnd = primaries + resultLength - 2;
uint32_t secSize = UCOL_SECONDARY_MAX_BUFFER, terSize = UCOL_TERTIARY_MAX_BUFFER,
caseSize = UCOL_CASE_MAX_BUFFER, quadSize = UCOL_QUAD_MAX_BUFFER;
@ -1519,9 +1518,10 @@ ucol_calcSortKey(const UCollator *coll,
len = s.len-s.pos;
if(resultLength == 0) {
if(resultLength == 0 || primaries == NULL) {
return ucol_getSortKeySize(coll, &s, sortKeySize, strength, len);
}
uint8_t *primarySafeEnd = primaries + resultLength - 2;
uint32_t minBufferSize = UCOL_MAX_BUFFER;
@ -1984,7 +1984,6 @@ ucol_calcSortKeySimpleTertiary(const UCollator *coll,
primaries = *result = prim;
resultLength = UCOL_PRIMARY_MAX_BUFFER;
}
uint8_t *primarySafeEnd = primaries + resultLength - 2;
uint32_t secSize = UCOL_SECONDARY_MAX_BUFFER, terSize = UCOL_TERTIARY_MAX_BUFFER;
@ -2023,9 +2022,10 @@ ucol_calcSortKeySimpleTertiary(const UCollator *coll,
len = s.len-s.pos;
if(resultLength == 0) {
if(resultLength == 0 || primaries == NULL) {
return ucol_getSortKeySize(coll, &s, sortKeySize, coll->strength, len);
}
uint8_t *primarySafeEnd = primaries + resultLength - 2;
uint32_t minBufferSize = UCOL_MAX_BUFFER;