Merge branch 'master' into feature/regex-type

1 files changed, 6 insertions, 1 deletions

diff --git a/regcomp.c b/regcomp.c
index f58cb091..3526d9ea 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1205,7 +1205,12 @@ analyze (regex_t *preg)
 	  || dfa->eclosures == NULL, 0))
     return REG_ESPACE;
 
-  dfa->subexp_map = re_malloc (int, preg->re_nsub);
+  /* some malloc()-checkers don't like zero allocations */
+  if (preg->re_nsub > 0)
+    dfa->subexp_map = re_malloc (int, preg->re_nsub);
+  else
+    dfa->subexp_map = NULL;
+
   if (dfa->subexp_map != NULL)
     {
       int i;