From 0325b4daf737414c3b811b05c70b897b807a436b Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Mon, 13 Apr 2015 10:09:04 +0300 Subject: Fix regex code to avoid malloc(0). --- regex_internal.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'regex_internal.h') diff --git a/regex_internal.h b/regex_internal.h index 9aab5e52..6a870f23 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -467,8 +467,38 @@ static unsigned int re_string_context_at (const re_string_t *input, int idx, # endif #endif +/* + * GAWK checks for zero-size allocations everywhere else, + * do it here too. + */ +#ifndef GAWK #define re_malloc(t,n) ((t *) malloc ((n) * sizeof (t))) #define re_realloc(p,t,n) ((t *) realloc (p, (n) * sizeof (t))) +#else +static void * +test_malloc(size_t count, const char *file, size_t line) +{ + if (count == 0) { + fprintf(stderr, "%s:%d: allocation of zero bytes\n", + file, line); + exit(1); + } + return malloc(count); +} + +static void * +test_realloc(void *p, size_t count, const char *file, size_t line) +{ + if (count == 0) { + fprintf(stderr, "%s:%d: reallocation of zero bytes\n", + file, line); + exit(1); + } + return realloc(p, count); +} +#define re_malloc(t,n) ((t *) test_malloc (((n) * sizeof (t)), __FILE__, __LINE__)) +#define re_realloc(p,t,n) ((t *) test_realloc (p, (n) * sizeof (t), __FILE__, __LINE__)) +#endif #define re_free(p) free (p) struct bin_tree_t -- cgit v1.2.3