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

Prevent overflow beyond the end of string in wtf_strwidth()

Browse Source 
Bug-Debian: https://github.com/tats/w3m/issues/57
This commit is contained in:
Tatsuya Kinoshita
2016-12-07 20:41:29 +09:00
parent 900553de6d
commit d345c0950d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwc/wtf.c
View File

@@ -120,10 +120,14 @@ int
wtf_strwidth(wc_uchar *p) wtf_strwidth(wc_uchar *p)
{ {
int w = 0; int w = 0;
size_t len;
while (*p) { while (*p) {
w += wtf_width(p); w += wtf_width(p);
p += WTF_LEN_MAP[*p]; len = WTF_LEN_MAP[*p];
if (len > strlen(p))
len = strlen(p);
p += len;
} }
return w; return w;
} }