storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent segfault when iso2022 parsing

Browse Source 
Bug-Debian: https://github.com/tats/w3m/issues/14
This commit is contained in:
Tatsuya Kinoshita
2016-08-17 21:30:50 +09:00
parent 807e8b7fbf
commit 9cf6926c5d
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libwc/iso2022.c
View File

@@ -405,7 +405,8 @@ wc_push_to_iso2022(Str os, wc_wchar_t cc, wc_status *st)
case WC_CCS_A_CS94: case WC_CCS_A_CS94:
if (cc.ccs == WC_CCS_US_ASCII) if (cc.ccs == WC_CCS_US_ASCII)
cc.ccs = st->g0_ccs; cc.ccs = st->g0_ccs;
g = cs94_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE]; if (WC_CCS_INDEX(cc.ccs) >= WC_F_ISO_BASE)
g = cs94_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE];
break; break;
case WC_CCS_A_CS94W: case WC_CCS_A_CS94W:
is_wide = 1; is_wide = 1;
@@ -435,31 +436,37 @@ wc_push_to_iso2022(Str os, wc_wchar_t cc, wc_status *st)
break; break;
#endif #endif
} }
g = cs94w_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE]; if (WC_CCS_INDEX(cc.ccs) >= WC_F_ISO_BASE)
g = cs94w_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE];
break; break;
case WC_CCS_A_CS96: case WC_CCS_A_CS96:
g = cs96_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE]; if (WC_CCS_INDEX(cc.ccs) >= WC_F_ISO_BASE)
g = cs96_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE];
break; break;
case WC_CCS_A_CS96W: case WC_CCS_A_CS96W:
is_wide = 1; is_wide = 1;
g = cs96w_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE]; if (WC_CCS_INDEX(cc.ccs) >= WC_F_ISO_BASE)
g = cs96w_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE];
break; break;
case WC_CCS_A_CS942: case WC_CCS_A_CS942:
g = cs942_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE]; if (WC_CCS_INDEX(cc.ccs) >= WC_F_ISO_BASE)
g = cs942_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE];
break; break;
case WC_CCS_A_UNKNOWN_W: case WC_CCS_A_UNKNOWN_W:
if (WcOption.no_replace) if (WcOption.no_replace)
return; return;
is_wide = 1; is_wide = 1;
cc.ccs = WC_CCS_US_ASCII; cc.ccs = WC_CCS_US_ASCII;
g = cs94_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE]; if (WC_CCS_INDEX(cc.ccs) >= WC_F_ISO_BASE)
g = cs94_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE];
cc.code = ((wc_uint32)WC_REPLACE_W[0] << 8) | WC_REPLACE_W[1]; cc.code = ((wc_uint32)WC_REPLACE_W[0] << 8) | WC_REPLACE_W[1];
break; break;
case WC_CCS_A_UNKNOWN: case WC_CCS_A_UNKNOWN:
if (WcOption.no_replace) if (WcOption.no_replace)
return; return;
cc.ccs = WC_CCS_US_ASCII; cc.ccs = WC_CCS_US_ASCII;
g = cs94_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE]; if (WC_CCS_INDEX(cc.ccs) >= WC_F_ISO_BASE)
g = cs94_gmap[WC_CCS_INDEX(cc.ccs) - WC_F_ISO_BASE];
cc.code = (wc_uint32)WC_REPLACE[0]; cc.code = (wc_uint32)WC_REPLACE[0];
break; break;
default: default: