aboutsummaryrefslogtreecommitdiffstats
path: root/libwc/wtf.h
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2016-12-15 14:10:38 +0000
committerTatsuya Kinoshita <tats@debian.org>2017-01-06 13:16:08 +0000
commit047640e060b257db92355847ae575c97b350584e (patch)
tree2a30ae0e582b863e5609a9f01330c3b8475fd4e0 /libwc/wtf.h
parentPrevent negative array index for realColumn in calcPosition() (diff)
downloadw3m-047640e060b257db92355847ae575c97b350584e.tar.gz
w3m-047640e060b257db92355847ae575c97b350584e.zip
Prevent overflow beyond the end of string in caller of get_mclen()
Bug-Debian: https://github.com/tats/w3m/issues/59 Bug-Debian: https://github.com/tats/w3m/issues/73 Bug-Debian: https://github.com/tats/w3m/issues/74 Bug-Debian: https://github.com/tats/w3m/issues/75 Bug-Debian: https://github.com/tats/w3m/issues/76 Bug-Debian: https://github.com/tats/w3m/issues/78 Bug-Debian: https://github.com/tats/w3m/issues/79 Bug-Debian: https://github.com/tats/w3m/issues/80 Bug-Debian: https://github.com/tats/w3m/issues/83 Bug-Debian: https://github.com/tats/w3m/issues/84 Origin: https://anonscm.debian.org/cgit/collab-maint/w3m.git/commit/?id=6eea841d3a0f8dc539584dc67b15f585a8213775
Diffstat (limited to '')
-rw-r--r--libwc/wtf.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libwc/wtf.h b/libwc/wtf.h
index ad47973..435526f 100644
--- a/libwc/wtf.h
+++ b/libwc/wtf.h
@@ -59,8 +59,7 @@ extern void wtf_init(wc_ces ces1, wc_ces ces2);
#define wtf_width(p) (WcOption.use_wide ? (int)WTF_WIDTH_MAP[(wc_uchar)*(p)] \
: ((int)WTF_WIDTH_MAP[(wc_uchar)*(p)] ? 1 : 0))
extern int wtf_strwidth(wc_uchar *p);
-/* extern size_t wtf_len1(wc_uchar *p); */
-#define wtf_len1(p) ((int)WTF_LEN_MAP[(wc_uchar)*(p)])
+extern size_t wtf_len1(wc_uchar *p);
extern size_t wtf_len(wc_uchar *p);
/* extern int wtf_type(wc_uchar *p); */
#define wtf_type(p) WTF_TYPE_MAP[(wc_uchar)*(p)]