This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-812-g7ee03f0


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  7ee03f00188723a4de2b85021e511ced6d7fc4be (commit)
      from  9d39d517a7c700d53e2f24e8855a9b3a5e046a63 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7ee03f00188723a4de2b85021e511ced6d7fc4be

commit 7ee03f00188723a4de2b85021e511ced6d7fc4be
Author: Jim Meyering <meyering@fb.com>
Date:   Sat Jul 12 17:07:21 2014 -0700

    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+++++++++++++++++++++ )

diff --git a/ChangeLog b/ChangeLog
index 3dd3cf0..41247ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-07-13  Jim Meyering  <meyering@fb.com>
+
+	[BZ 17150]
+	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+++++++++++++++++++++ )
+
 2014-07-13  Andreas Schwab  <schwab@linux-m68k.org>

 	* sysdeps/m68k/m680x0/fpu/libm-test-ulps: Update.
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 076eca3..8f2747b 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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |   10 ++++++++++
 posix/regcomp.c |    2 ++
 2 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]