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

ICU-785 add length check when getting surrogate pairs

Browse Source 
X-SVN-Rev: 6829
This commit is contained in:
Markus Scherer 2001-11-13 19:27:56 +00:00
parent 111f368fb4
commit 560b782d42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4c/source/common/ustring.c
View File

@ -830,7 +830,7 @@ u_internalStrcasecmp(const UChar *s1, int32_t length1,
if(pos1>=len1) {
if(length1>0) {
c=*s1++;
if(UTF_IS_FIRST_SURROGATE(c) && UTF_IS_SECOND_SURROGATE(uc=*s1)) {
if(UTF_IS_FIRST_SURROGATE(c) && length1>1 && UTF_IS_SECOND_SURROGATE(uc=*s1)) {
c=UTF16_GET_PAIR_VALUE(c, uc);
++s1;
length1-=2;
@ -848,7 +848,7 @@ u_internalStrcasecmp(const UChar *s1, int32_t length1,
if(pos2>=len2) {
if(length2>0) {
c=*s2++;
if(UTF_IS_FIRST_SURROGATE(c) && UTF_IS_SECOND_SURROGATE(uc=*s2)) {
if(UTF_IS_FIRST_SURROGATE(c) && length2>1 && UTF_IS_SECOND_SURROGATE(uc=*s2)) {
c=UTF16_GET_PAIR_VALUE(c, uc);
++s2;
length2-=2;