From 7ee03f00188723a4de2b85021e511ced6d7fc4be Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Sat, 12 Jul 2014 17:07:21 -0700
Subject: regex: don't deref NULL upon heap allocation failure

* posix/regcomp.c: (parse_dup_op): Handle duplicate_tree
failure in one more place.
To trigger the segfault, configure grep -with-included-regex,
build it, and run these commands:
( ulimit -v 300000; echo a|src/grep -E a+++++++++++++++++++++ )
---
 posix/regcomp.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'posix')

diff --git a/posix/regcomp.c b/posix/regcomp.c
index 076eca3e7c..8f2747b3c9 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -2582,6 +2582,8 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
 
       /* Duplicate ELEM before it is marked optional.  */
       elem = duplicate_tree (elem, dfa);
+      if (BE (elem == NULL, 0))
+        goto parse_dup_op_espace;
       old_tree = tree;
     }
   else
-- 
cgit 1.4.1