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

Prevent overflow beyond the end of string in caller of get_mclen()

Browse Source 
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/76
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
This commit is contained in:
Tatsuya Kinoshita
2016-12-15 23:10:38 +09:00
parent 107810c145
commit 6eea841d3a
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libwc/wtf.c
View File

@@ -129,13 +129,18 @@ wtf_strwidth(wc_uchar *p)
return w;
}
/*
size_t
wtf_len1(wc_uchar *p)
{
return (size_t)WTF_LEN_MAP[*p];
size_t len, len_max = WTF_LEN_MAP[*p];
for (len = 0; *(p + len); len++)
if (len == len_max)
break;
if (len == 0)
len = 1;
return len;
}
*/
size_t
wtf_len(wc_uchar *p)

3
libwc/wtf.h
View File

@@ -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)]