mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-14 12:13:22 +00:00
fix bug 115519. r= shanjian sr= sfraser . make the convert return NS_OK
when it really did it's job.
This commit is contained in:
parent
d97ab2a4c3
commit
815b067511
@ -235,7 +235,11 @@ NS_IMETHODIMP nsShiftJISToUnicode::Convert(
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
error1:
|
error1:
|
||||||
*aDestLen = dest-aDest;
|
*aDestLen = dest-aDest;
|
||||||
*aSrcLen = src-(unsigned char*)aSrc;
|
src++;
|
||||||
|
if ((mState == 0) && (src == srcEnd)) {
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
*aSrcLen = src - (const unsigned char*)aSrc;
|
||||||
return NS_OK_UDEC_MOREOUTPUT;
|
return NS_OK_UDEC_MOREOUTPUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -442,7 +446,11 @@ NS_IMETHODIMP nsEUCJPToUnicodeV2::Convert(
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
error1:
|
error1:
|
||||||
*aDestLen = dest-aDest;
|
*aDestLen = dest-aDest;
|
||||||
*aSrcLen = src-(unsigned char*)aSrc;
|
src++;
|
||||||
|
if ((mState == 0) && (src == srcEnd)) {
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
*aSrcLen = src - (const unsigned char*)aSrc;
|
||||||
return NS_OK_UDEC_MOREOUTPUT;
|
return NS_OK_UDEC_MOREOUTPUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -929,6 +937,10 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert(
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
error1:
|
error1:
|
||||||
*aDestLen = dest-aDest;
|
*aDestLen = dest-aDest;
|
||||||
*aSrcLen = src-(unsigned char*)aSrc;
|
src++;
|
||||||
|
if ((mState == 0) && (src == srcEnd)) {
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
*aSrcLen = src - (const unsigned char*)aSrc;
|
||||||
return NS_OK_UDEC_MOREOUTPUT;
|
return NS_OK_UDEC_MOREOUTPUT;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user