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

Prevent very small allocation in Str.c

Browse Source
This commit is contained in:
Tatsuya Kinoshita
2021-03-20 23:57:47 +09:00
parent 0cf850fcfa
commit 8d16266f0e
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Str.c
View File

@@ -58,6 +58,8 @@ Strnew_size(int n)
exit(1); exit(1);
if (n < 0 || n >= STR_SIZE_MAX) if (n < 0 || n >= STR_SIZE_MAX)
n = STR_SIZE_MAX - 1; n = STR_SIZE_MAX - 1;
else if (n + 1 < INITIAL_STR_SIZE)
n = INITIAL_STR_SIZE - 1;
x->ptr = GC_MALLOC_ATOMIC(n + 1); x->ptr = GC_MALLOC_ATOMIC(n + 1);
if (x->ptr == NULL) if (x->ptr == NULL)
exit(1); exit(1);
@@ -71,7 +73,7 @@ Str
Strnew_charp(const char *p) Strnew_charp(const char *p)
{ {
Str x; Str x;
int n; int n, len;
if (p == NULL) if (p == NULL)
return Strnew(); return Strnew();
@@ -81,12 +83,15 @@ Strnew_charp(const char *p)
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;
len = n - 1;
if (n < INITIAL_STR_SIZE)
n = INITIAL_STR_SIZE;
x->ptr = GC_MALLOC_ATOMIC(n); x->ptr = GC_MALLOC_ATOMIC(n);
if (x->ptr == NULL) if (x->ptr == NULL)
exit(1); exit(1);
x->area_size = n; x->area_size = n;
x->length = n - 1; x->length = len;
bcopy((void *)p, (void *)x->ptr, n - 1); bcopy((void *)p, (void *)x->ptr, len);
x->ptr[x->length] = '\0'; x->ptr[x->length] = '\0';
return x; return x;
} }
@@ -109,6 +114,7 @@ Str
Strnew_charp_n(const char *p, int n) Strnew_charp_n(const char *p, int n)
{ {
Str x; Str x;
int len;
if (p == NULL) if (p == NULL)
return Strnew_size(n); return Strnew_size(n);
@@ -117,13 +123,16 @@ Strnew_charp_n(const char *p, int n)
exit(1); exit(1);
if (n < 0 || n >= STR_SIZE_MAX) if (n < 0 || n >= STR_SIZE_MAX)
n = STR_SIZE_MAX - 1; n = STR_SIZE_MAX - 1;
len = n;
if (n + 1 < INITIAL_STR_SIZE)
n = INITIAL_STR_SIZE - 1;
x->ptr = GC_MALLOC_ATOMIC(n + 1); x->ptr = GC_MALLOC_ATOMIC(n + 1);
if (x->ptr == NULL) if (x->ptr == NULL)
exit(1); exit(1);
x->area_size = n + 1; x->area_size = n + 1;
x->length = n; x->length = len;
bcopy((void *)p, (void *)x->ptr, n); bcopy((void *)p, (void *)x->ptr, len);
x->ptr[n] = '\0'; x->ptr[x->length] = '\0';
return x; return x;
} }
@@ -274,10 +283,11 @@ Strcat_m_charp(Str x, ...)
void void
Strgrow(Str x) Strgrow(Str x)
{ {
int newlen; int newlen, addlen;
newlen = x->area_size + x->area_size / 5; addlen = x->area_size / 5;
if (newlen == x->area_size) if (addlen < INITIAL_STR_SIZE)
newlen += 2; addlen = INITIAL_STR_SIZE;
newlen = x->area_size + addlen;
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)