regex: don't infloop on persistent failing calloc

* lib/regexec.c (build_trtable): Return failure indication upon
calloc failure.  Otherwise, re_search_internal could infloop on OOM.
In glibc, this was fixed for version 2.13:
http://sourceware.org/bugzilla/show_bug.cgi?id=12348

diff --git a/ChangeLog b/ChangeLog
index 0d175a2f685710086a067c47b62b9b096b64c526..0a17782b9a038b15086e7a01fcbebfbe6c58e5ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-28  Jim Meyering  <meyering@redhat.com>
+
+       regex: don't infloop on persistent failing calloc
+       * lib/regexec.c (build_trtable): Return failure indication upon
+       calloc failure.  Otherwise, re_search_internal could infloop on OOM.
+       In glibc, this was fixed for version 2.13:
+       http://sourceware.org/bugzilla/show_bug.cgi?id=12348
+
 2010-12-28  Bruno Haible  <bruno@clisp.org>
             Paul Eggert <eggert@cs.ucla.edu>
 

diff --git a/lib/regexec.c b/lib/regexec.c
index 9388ac12bfd779dbf249dd49ff1d5b16887325f9..ee702bc6f6a3d1ac0f1fe9a39b804ea6299eb5b9 100644 (file)
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -3402,6 +3402,8 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
        {
          state->trtable = (re_dfastate_t **)
            calloc (sizeof (re_dfastate_t *), SBC_MAX);
+          if (BE (state->trtable == NULL, 0))
+            return false;
          return true;
        }
       return false;