diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2016-12-15 14:29:03 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2016-12-15 15:44:49 +0000 |
| commit | c3a3305e0334f76626aeaca76bcfab04a94f851d (patch) | |
| tree | fa47fea5de3d57a4d2569f0299b6f02c0999e9a9 | |
| parent | Revert "Prevent overflow beyond the end of string for wtf to wcs macros" (diff) | |
| download | w3m-c3a3305e0334f76626aeaca76bcfab04a94f851d.tar.gz w3m-c3a3305e0334f76626aeaca76bcfab04a94f851d.zip | |
Prevent overflow beyond the end of string for wtf to wcs macros
Bug-Debian: https://github.com/tats/w3m/issues/77
| -rw-r--r-- | libwc/wtf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libwc/wtf.c b/libwc/wtf.c index ec082b1..5bddf29 100644 --- a/libwc/wtf.c +++ b/libwc/wtf.c @@ -173,15 +173,17 @@ wtf_type(wc_uchar *p) ((p)[3] = (((c) >> 7) & 0x7f) | 0x80), \ ((p)[4] = ( (c) & 0x7f) | 0x80) #define wtf_to_wcs16(p) \ + ((p)[0] == 0 || (p)[1] == 0 || (p)[2] == 0 ? 0 : \ ((wc_uint32)((p)[0] & 0x03) << 14) \ | ((wc_uint32)((p)[1] & 0x7f) << 7) \ - | ((wc_uint32)((p)[2] & 0x7f) ) + | ((wc_uint32)((p)[2] & 0x7f) )) #define wtf_to_wcs32(p) \ + ((p)[0] == 0 || (p)[1] == 0 || (p)[2] == 0 || (p)[3] == 0 || (p)[4] == 0 ? 0 : \ ((wc_uint32)((p)[0] & 0x0f) << 28) \ | ((wc_uint32)((p)[1] & 0x7f) << 21) \ | ((wc_uint32)((p)[2] & 0x7f) << 14) \ | ((wc_uint32)((p)[3] & 0x7f) << 7) \ - | ((wc_uint32)((p)[4] & 0x7f) ) + | ((wc_uint32)((p)[4] & 0x7f) )) void wtf_push(Str os, wc_ccs ccs, wc_uint32 code) |