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

Revert "Prevent overflow beyond the end of string for wtf to wcs macros"

Browse Source 
This reverts commit b4d27ba5cc.
This commit is contained in:
Tatsuya Kinoshita
2016-12-15 23:25:09 +09:00
parent 6eea841d3a
commit 922d6f7901
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwc/wtf.c
View File

@@ -173,17 +173,15 @@ wtf_type(wc_uchar *p)
((p)[3] = (((c) >> 7) & 0x7f) | 0x80), \ ((p)[3] = (((c) >> 7) & 0x7f) | 0x80), \
((p)[4] = ( (c) & 0x7f) | 0x80) ((p)[4] = ( (c) & 0x7f) | 0x80)
#define wtf_to_wcs16(p) \ #define wtf_to_wcs16(p) \
(strlen(p) < 3 ? 0 : \
((wc_uint32)((p)[0] & 0x03) << 14) \ ((wc_uint32)((p)[0] & 0x03) << 14) \
| ((wc_uint32)((p)[1] & 0x7f) << 7) \ | ((wc_uint32)((p)[1] & 0x7f) << 7) \
| ((wc_uint32)((p)[2] & 0x7f) )) | ((wc_uint32)((p)[2] & 0x7f) )
#define wtf_to_wcs32(p) \ #define wtf_to_wcs32(p) \
(strlen(p) < 5 ? 0 : \
((wc_uint32)((p)[0] & 0x0f) << 28) \ ((wc_uint32)((p)[0] & 0x0f) << 28) \
| ((wc_uint32)((p)[1] & 0x7f) << 21) \ | ((wc_uint32)((p)[1] & 0x7f) << 21) \
| ((wc_uint32)((p)[2] & 0x7f) << 14) \ | ((wc_uint32)((p)[2] & 0x7f) << 14) \
| ((wc_uint32)((p)[3] & 0x7f) << 7) \ | ((wc_uint32)((p)[3] & 0x7f) << 7) \
| ((wc_uint32)((p)[4] & 0x7f) )) | ((wc_uint32)((p)[4] & 0x7f) )
void void
wtf_push(Str os, wc_ccs ccs, wc_uint32 code) wtf_push(Str os, wc_ccs ccs, wc_uint32 code)