Commit f51c0966 authored by Tatsuya Kinoshita's avatar Tatsuya Kinoshita

Revert "Prevent overflow beyond the end of string in wtf_parse1()"

This reverts commit 998b6f91.
Bug-Debian: https://github.com/tats/w3m/issues/86
cf. http://emacs-w3m.namazu.org/ml/msg12505.html
parent eb4130a7
...@@ -397,51 +397,45 @@ wtf_parse1(wc_uchar **p) ...@@ -397,51 +397,45 @@ wtf_parse1(wc_uchar **p)
cc.code = *(q++); cc.code = *(q++);
} else if (*q > 0xa0) { } else if (*q > 0xa0) {
cc.ccs = wtf_gr_ccs; cc.ccs = wtf_gr_ccs;
if (WC_CCS_IS_WIDE(cc.ccs) && *(q+1)) { if (WC_CCS_IS_WIDE(cc.ccs)) {
cc.code = ((wc_uint32)*q << 8) | *(q+1); cc.code = ((wc_uint32)*q << 8) | *(q+1);
q += 2; q += 2;
} else } else
cc.code = *(q++); cc.code = *(q++);
} else { } else {
cc.ccs = WC_CCS_US_ASCII; cc.ccs = (wc_uint32)CCS_MAP[*(q++) - 0x80] << 8;
cc.code = (wc_uint32)' ';
if (*q)
cc.ccs = (wc_uint32)CCS_MAP[*(q++) - 0x80] << 8;
switch (WC_CCS_TYPE(cc.ccs)) { switch (WC_CCS_TYPE(cc.ccs)) {
case WC_CCS_A_CS94: case WC_CCS_A_CS94:
case WC_CCS_A_CS96: case WC_CCS_A_CS96:
case WC_CCS_A_CS942: case WC_CCS_A_CS942:
case WC_CCS_A_PCS: case WC_CCS_A_PCS:
case WC_CCS_A_UNKNOWN: case WC_CCS_A_UNKNOWN:
if (*q && *(q+1)) { cc.ccs |= *(q++) & 0x7f;
cc.ccs |= *(q++) & 0x7f; cc.code = *(q++);
cc.code = *(q++);
}
break; break;
case WC_CCS_A_CS94W: case WC_CCS_A_CS94W:
case WC_CCS_A_CS96W: case WC_CCS_A_CS96W:
case WC_CCS_A_PCSW: case WC_CCS_A_PCSW:
if (*q && *(q+1) && *(q+2)) { cc.ccs |= *(q++) & 0x7f;
cc.ccs |= *(q++) & 0x7f; cc.code = ((wc_uint32)*q << 8) | *(q+1);
cc.code = ((wc_uint32)*q << 8) | *(q+1); q += 2;
q += 2;
}
break; break;
case WC_CCS_A_WCS16: case WC_CCS_A_WCS16:
case WC_CCS_A_WCS16W: case WC_CCS_A_WCS16W:
if (*q && *(q+1) && *(q+2)) { cc.ccs |= (*q & 0x7c) >> 2;
cc.ccs |= (*q & 0x7c) >> 2; cc.code = wtf_to_wcs16(q);
cc.code = wtf_to_wcs16(q); q += 3;
q += 3;
}
break; break;
case WC_CCS_A_WCS32: case WC_CCS_A_WCS32:
case WC_CCS_A_WCS32W: case WC_CCS_A_WCS32W:
if (*q && *(q+1) && *(q+2) && *(q+3) && *(q+4)) { cc.ccs |= (*q & 0x70) >> 4;
cc.ccs |= (*q & 0x70) >> 4; cc.code = wtf_to_wcs32(q);
cc.code = wtf_to_wcs32(q); q += 5;
q += 5; break;
} default:
/* case 0: */
cc.ccs = WC_CCS_US_ASCII;
cc.code = (wc_uint32)' ';
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment