Fix possibly uninitilized variable handling.

If malloc errors are ignored (which say aren't by default and never
should be) malloc in the old, slow form might use an uninitialized
variable.

diff --git a/ChangeLog b/ChangeLog
index c35f5ff..9d83777 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-08  Ulrich Drepper  <drepper@redhat.com>
+
+       * malloc/malloc.c (_int_malloc): Return NULL if printing error message
+       returns.
+
 2010-03-30  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * Makeconfig (+common-includes): Define.

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 558e8ba..722b1d4 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4306,6 +4306,7 @@ _int_malloc(mstate av, size_t bytes)
          errstr = "malloc(): memory corruption (fast)";
        errout:
          malloc_printerr (check_action, errstr, chunk2mem (victim));
+         return NULL;
        }
 #ifndef ATOMIC_FASTBINS
       *fb = victim->fd;