diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-04-12 13:40:20 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-04-12 13:40:20 +0200 |
| commit | 1fd194fb757480a11ebd877e17dd627c90d76dd1 (patch) | |
| tree | 9ad22d95dd8673bc036d14b0055a8dcd6febe09e /malloc | |
| parent | 4ac4e460b116fb6da6e80124f4c4f6968eb86341 (diff) | |
| parent | ea42a20caed5b343ff20a0d4622ae6c17b77161b (diff) | |
| download | glibc-1fd194fb757480a11ebd877e17dd627c90d76dd1.tar.gz glibc-1fd194fb757480a11ebd877e17dd627c90d76dd1.tar.xz glibc-1fd194fb757480a11ebd877e17dd627c90d76dd1.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 558e8bab0a..722b1d4961 100644 --- 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; |