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

Revert "Prevent overflow beyond the end of string in form_update_line()"

Browse Source 
This reverts commit 9ccaa1dd0d.
This commit is contained in:
Tatsuya Kinoshita
2016-12-18 00:20:15 +09:00
parent eba7f423fc
commit 5d665be811
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
form.c
View File

@@ -278,10 +278,10 @@ form_update_line(Line *line, char **str, int spos, int epos, int width,
int newline, int password) int newline, int password)
{ {
int c_len = 1, c_width = 1, w, i, len, pos; int c_len = 1, c_width = 1, w, i, len, pos;
char *p, *buf, *q = *str + strlen(*str); char *p, *buf;
Lineprop c_type, effect, *prop; Lineprop c_type, effect, *prop;
for (p = *str, w = 0, pos = 0; p < q && w < width;) { for (p = *str, w = 0, pos = 0; *p && w < width;) {
c_type = get_mctype((unsigned char *)p); c_type = get_mctype((unsigned char *)p);
#ifdef USE_M17N #ifdef USE_M17N
c_len = get_mclen(p); c_len = get_mclen(p);
@@ -326,7 +326,7 @@ form_update_line(Line *line, char **str, int spos, int epos, int width,
bcopy((void *)line->propBuf, (void *)prop, spos * sizeof(Lineprop)); bcopy((void *)line->propBuf, (void *)prop, spos * sizeof(Lineprop));
effect = CharEffect(line->propBuf[spos]); effect = CharEffect(line->propBuf[spos]);
for (p = *str, w = 0, pos = spos; p < q && w < width;) { for (p = *str, w = 0, pos = spos; *p && w < width;) {
c_type = get_mctype((unsigned char *)p); c_type = get_mctype((unsigned char *)p);
#ifdef USE_M17N #ifdef USE_M17N
c_len = get_mclen(p); c_len = get_mclen(p);
@@ -347,7 +347,7 @@ form_update_line(Line *line, char **str, int spos, int epos, int width,
if (w + c_width > width) if (w + c_width > width)
break; break;
#endif #endif
for (i = 0; pos < len && i < c_width; i++) { for (i = 0; i < c_width; i++) {
buf[pos] = '*'; buf[pos] = '*';
prop[pos] = effect | PC_ASCII; prop[pos] = effect | PC_ASCII;
pos++; pos++;
@@ -373,7 +373,7 @@ form_update_line(Line *line, char **str, int spos, int epos, int width,
pos++; pos++;
#ifdef USE_M17N #ifdef USE_M17N
c_type = (c_type & ~PC_WCHAR1) | PC_WCHAR2; c_type = (c_type & ~PC_WCHAR1) | PC_WCHAR2;
for (i = 1; pos < len && p + i < q && i < c_len; i++) { for (i = 1; i < c_len; i++) {
buf[pos] = p[i]; buf[pos] = p[i];
prop[pos] = effect | c_type; prop[pos] = effect | c_type;
pos++; pos++;
@@ -383,7 +383,7 @@ form_update_line(Line *line, char **str, int spos, int epos, int width,
} }
p += c_len; p += c_len;
} }
for (; pos < len && w < width; w++) { for (; w < width; w++) {
buf[pos] = ' '; buf[pos] = ' ';
prop[pos] = effect | PC_ASCII; prop[pos] = effect | PC_ASCII;
pos++; pos++;
@@ -398,8 +398,6 @@ form_update_line(Line *line, char **str, int spos, int epos, int width,
if (*p == '\n') if (*p == '\n')
p++; p++;
} }
if (p > q)
p = q;
*str = p; *str = p;
bcopy((void *)&line->lineBuf[epos], (void *)&buf[pos], bcopy((void *)&line->lineBuf[epos], (void *)&buf[pos],