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

ICU-5018 fix error code propagation

Browse Source 
X-SVN-Rev: 20251
This commit is contained in:
Winnie Yick 2006-09-07 17:53:14 +00:00
parent b21db770e7
commit 99b1b9774e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4j/src/com/ibm/icu/impl/CharsetUTF16.java
View File

@ -283,11 +283,12 @@ public class CharsetUTF16 extends CharsetICU {
int sourceIndex = 0; int sourceIndex = 0;
char trail = 0; char trail = 0;
int length = source.remaining(); int length = source.remaining();
int sourceArrayIndex = source.position();
try{ try{
/* c!=0 indicates in several places outside the main loops that a surrogate was found */ /* c!=0 indicates in several places outside the main loops that a surrogate was found */
if((c=(char)fromUChar32)!=0 && UTF16.isTrailSurrogate(trail=source.get(sourceIndex)) && target.remaining()>=4) { if((c=(char)fromUChar32)!=0 && UTF16.isTrailSurrogate(trail=source.get(sourceArrayIndex)) && target.remaining()>=4) {
/* the last buffer ended with a lead surrogate, output the surrogate pair */ /* the last buffer ended with a lead surrogate, output the surrogate pair */
++sourceIndex; ++sourceIndex;
--length; --length;
@ -305,7 +306,6 @@ public class CharsetUTF16 extends CharsetICU {
fromUChar32=c=0; fromUChar32=c=0;
} }
byte overflow[/*4*/] = new byte[4]; byte overflow[/*4*/] = new byte[4];
int sourceArrayIndex = source.position();
if(c==0) { if(c==0) {
/* copy an even number of bytes for complete UChars */ /* copy an even number of bytes for complete UChars */
@ -421,7 +421,7 @@ public class CharsetUTF16 extends CharsetICU {
} }
} else { } else {
/* unmatched trail surrogate */ /* unmatched trail surrogate */
//pErrorCode[0]=ErrorCode.U_ILLEGAL_CHAR_FOUND; cr = CoderResult.malformedForLength(sourceArrayIndex);
} }
fromUChar32=c; fromUChar32=c;
} }

12
icu4j/src/com/ibm/icu/impl/CharsetUTF16LE.java
View File

@ -286,13 +286,14 @@ public class CharsetUTF16LE extends CharsetICU {
int sourceIndex = 0; int sourceIndex = 0;
char trail = 0; char trail = 0;
int length = source.remaining(); int length = source.remaining();
int sourceArrayIndex = source.position();
try{ try{
/* c!=0 indicates in several places outside the main loops that a surrogate was found */ /* c!=0 indicates in several places outside the main loops that a surrogate was found */
if((c=(char)fromUChar32)!=0 && UTF16.isTrailSurrogate(trail=source.get(sourceIndex)) && target.remaining()>=4) { if((c=(char)fromUChar32)!=0 && UTF16.isTrailSurrogate(trail=source.get(sourceArrayIndex)) && target.remaining()>=4) {
/* the last buffer ended with a lead surrogate, output the surrogate pair */ /* the last buffer ended with a lead surrogate, output the surrogate pair */
++sourceIndex; ++sourceArrayIndex;
--length; --length;
target.put((byte)c); target.put((byte)c);
target.put((byte)(c>>>8)); target.put((byte)(c>>>8));
@ -308,12 +309,12 @@ public class CharsetUTF16LE extends CharsetICU {
fromUChar32=c=0; fromUChar32=c=0;
} }
byte overflow[/*4*/] = new byte[4]; byte overflow[/*4*/] = new byte[4];
int sourceArrayIndex = source.position();
if(c==0) { if(c==0) {
/* copy an even number of bytes for complete UChars */ /* copy an even number of bytes for complete UChars */
int count=2*length; int count=2*length;
int targetCapacity = target.limit(); int targetCapacity = target.remaining();
if(count>targetCapacity) { if(count>targetCapacity) {
count=targetCapacity&~1; count=targetCapacity&~1;
} }
@ -416,7 +417,6 @@ public class CharsetUTF16LE extends CharsetICU {
c=0; c=0;
} else { } else {
/* unmatched lead surrogate */ /* unmatched lead surrogate */
//pErrorCode[0]=ErrorCode.U_ILLEGAL_CHAR_FOUND;
cr = CoderResult.malformedForLength(sourceArrayIndex); cr = CoderResult.malformedForLength(sourceArrayIndex);
} }
} else { } else {
@ -424,7 +424,7 @@ public class CharsetUTF16LE extends CharsetICU {
} }
} else { } else {
/* unmatched trail surrogate */ /* unmatched trail surrogate */
//pErrorCode[0]=ErrorCode.U_ILLEGAL_CHAR_FOUND; cr = CoderResult.malformedForLength(sourceArrayIndex);
} }
fromUChar32=c; fromUChar32=c;
} }