From 288b15d0793936fa14b51ed860056f6ce6200c52 Mon Sep 17 00:00:00 2001 From: "Andrew J. Schorr" Date: Thu, 22 Jun 2017 08:26:27 -0400 Subject: Replace malloc+memset with calloc, mostly by using the new ezalloc macro. --- extension/rwarray.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'extension/rwarray.c') diff --git a/extension/rwarray.c b/extension/rwarray.c index a7d752cf..370e38ac 100644 --- a/extension/rwarray.c +++ b/extension/rwarray.c @@ -482,8 +482,7 @@ read_value(FILE *fp, awk_value_t *value) break; } value->str_value.len = len; - value->str_value.str = gawk_malloc(len + 1); - memset(value->str_value.str, '\0', len + 1); + value->str_value.str = gawk_calloc(1, len + 1); if (fread(value->str_value.str, 1, len, fp) != (ssize_t) len) { gawk_free(value->str_value.str); -- cgit v1.2.3 From f4df3ba54ba5c2a4aec34d643424834c03645dd9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Schorr" Date: Thu, 22 Jun 2017 15:21:38 -0400 Subject: In rwarray extensions, use malloc where calloc not needed. --- extension/rwarray.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'extension/rwarray.c') diff --git a/extension/rwarray.c b/extension/rwarray.c index 370e38ac..53c908df 100644 --- a/extension/rwarray.c +++ b/extension/rwarray.c @@ -482,12 +482,13 @@ read_value(FILE *fp, awk_value_t *value) break; } value->str_value.len = len; - value->str_value.str = gawk_calloc(1, len + 1); + value->str_value.str = gawk_malloc(len + 1); if (fread(value->str_value.str, 1, len, fp) != (ssize_t) len) { gawk_free(value->str_value.str); return awk_false; } + value->str_value.str[len] = '\0'; } return awk_true; -- cgit v1.2.3