Backout cset 308f180eb3f4

This commit is contained in:
Simon Montagu 2011-10-18 15:09:45 +02:00
parent 23fcb4824f
commit 6f5c3864dc

View File

@ -169,14 +169,7 @@ NS_IMETHODIMP nsShiftJISToUnicode::Convert(
case 1: // Index to table
{
PRUint8 off = sbIdx[*src];
// Error handling: in the case where the second octet is not in the
// valid ranges 0x40-0x7E 0x80-0xFC, unconsume the invalid octet and
// interpret it as the ASCII value. In the case where the second
// octet is in the valid range but there is no mapping for the
// 2-octet sequence, do not unconsume.
if(0xFF == off) {
src--;
if (mErrBehavior == kOnError_Signal)
goto error_invalidchar;
*dest++ = SJIS_UNMAPPED;
@ -198,10 +191,7 @@ NS_IMETHODIMP nsShiftJISToUnicode::Convert(
case 2: // EUDC
{
PRUint8 off = sbIdx[*src];
// Error handling as in case 1
if(0xFF == off) {
src--;
if (mErrBehavior == kOnError_Signal)
goto error_invalidchar;