From e37579c13c466b0704b2c3ce17edd2ecf0cc9f36 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Mon, 1 Mar 2021 06:48:57 +0900 Subject: Prevent zero size allocation in Str.c --- Str.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Str.c b/Str.c index aa47dc6..03e0950 100644 --- a/Str.c +++ b/Str.c @@ -69,7 +69,7 @@ Strnew_charp(const char *p) return Strnew(); x = GC_MALLOC(sizeof(struct _Str)); n = strlen(p) + 1; - if (n < 0 || n > STR_SIZE_MAX) + if (n <= 0 || n > STR_SIZE_MAX) n = STR_SIZE_MAX; x->ptr = GC_MALLOC_ATOMIC(n); x->area_size = n; @@ -206,14 +206,14 @@ Strcat_charp_n(Str x, const char *y, int n) if (n < 0) n = STR_SIZE_MAX - 1; newlen = x->length + n + 1; - if (newlen < 0 || newlen > STR_SIZE_MAX) { + if (newlen <= 0 || newlen > STR_SIZE_MAX) { newlen = STR_SIZE_MAX; n = newlen - x->length - 1; } if (x->area_size < newlen) { char *old = x->ptr; newlen += newlen / 2; - if (newlen < 0 || newlen > STR_SIZE_MAX) + if (newlen <= 0 || newlen > STR_SIZE_MAX) newlen = STR_SIZE_MAX; x->ptr = GC_MALLOC_ATOMIC(newlen); x->area_size = newlen; @@ -259,7 +259,7 @@ Strgrow(Str x) newlen = x->area_size + x->area_size / 5; if (newlen == x->area_size) newlen += 2; - if (newlen < 0 || newlen > STR_SIZE_MAX) { + if (newlen <= 0 || newlen > STR_SIZE_MAX) { newlen = STR_SIZE_MAX; if (x->length + 1 >= newlen) x->length = newlen - 2; -- cgit v1.2.3