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

Prevent zero size allocation in Str.c

Browse Source
This commit is contained in:
Tatsuya Kinoshita
2021-03-01 06:48:57 +09:00
parent b578e93c13
commit 38cbe69280
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Str.c
View File

@@ -69,7 +69,7 @@ Strnew_charp(const char *p)
return Strnew(); return Strnew();
x = GC_MALLOC(sizeof(struct _Str)); x = GC_MALLOC(sizeof(struct _Str));
n = strlen(p) + 1; n = strlen(p) + 1;
if (n < 0 || n > STR_SIZE_MAX) if (n <= 0 || n > STR_SIZE_MAX)
n = STR_SIZE_MAX; n = STR_SIZE_MAX;
x->ptr = GC_MALLOC_ATOMIC(n); x->ptr = GC_MALLOC_ATOMIC(n);
x->area_size = n; x->area_size = n;
@@ -206,14 +206,14 @@ Strcat_charp_n(Str x, const char *y, int n)
if (n < 0) if (n < 0)
n = STR_SIZE_MAX - 1; n = STR_SIZE_MAX - 1;
newlen = x->length + n + 1; newlen = x->length + n + 1;
if (newlen < 0 || newlen > STR_SIZE_MAX) { if (newlen <= 0 || newlen > STR_SIZE_MAX) {
newlen = STR_SIZE_MAX; newlen = STR_SIZE_MAX;
n = newlen - x->length - 1; n = newlen - x->length - 1;
} }
if (x->area_size < newlen) { if (x->area_size < newlen) {
char *old = x->ptr; char *old = x->ptr;
newlen += newlen / 2; newlen += newlen / 2;
if (newlen < 0 || newlen > STR_SIZE_MAX) if (newlen <= 0 || newlen > STR_SIZE_MAX)
newlen = STR_SIZE_MAX; newlen = STR_SIZE_MAX;
x->ptr = GC_MALLOC_ATOMIC(newlen); x->ptr = GC_MALLOC_ATOMIC(newlen);
x->area_size = newlen; x->area_size = newlen;
@@ -259,7 +259,7 @@ Strgrow(Str x)
newlen = x->area_size + x->area_size / 5; newlen = x->area_size + x->area_size / 5;
if (newlen == x->area_size) if (newlen == x->area_size)
newlen += 2; newlen += 2;
if (newlen < 0 || newlen > STR_SIZE_MAX) { if (newlen <= 0 || newlen > STR_SIZE_MAX) {
newlen = STR_SIZE_MAX; newlen = STR_SIZE_MAX;
if (x->length + 1 >= newlen) if (x->length + 1 >= newlen)
x->length = newlen - 2; x->length = newlen - 2;