diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2012-10-15 14:19:43 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2012-10-15 14:19:43 -0700 |
commit | 12131234750c1f8743bead5c6cb1eb5d6af61d32 (patch) | |
tree | 45f92b148250974d7c751ae474387d736a4ae8a4 /libiberty/objalloc.c | |
parent | 978c07fd9d5b0792ec9c2be54cbdcc899265439f (diff) | |
parent | 5164ec17af2b8a66674aaf0ee013ed9d71fa383e (diff) | |
download | gdb-hjl/x32/master.tar.gz |
Merge remote-tracking branch 'origin/master' into hjl/x32/masterhjl/x32/master
Diffstat (limited to 'libiberty/objalloc.c')
-rw-r--r-- | libiberty/objalloc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libiberty/objalloc.c b/libiberty/objalloc.c index 3ddac2ce4cb..72e92d2ddce 100644 --- a/libiberty/objalloc.c +++ b/libiberty/objalloc.c @@ -1,5 +1,5 @@ /* objalloc.c -- routines to allocate memory for objects - Copyright 1997 Free Software Foundation, Inc. + Copyright 1997-2012 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Solutions. This program is free software; you can redistribute it and/or modify it @@ -112,8 +112,10 @@ objalloc_create (void) /* Allocate space from an objalloc structure. */ PTR -_objalloc_alloc (struct objalloc *o, unsigned long len) +_objalloc_alloc (struct objalloc *o, unsigned long original_len) { + unsigned long len = original_len; + /* We avoid confusion from zero sized objects by always allocating at least 1 byte. */ if (len == 0) @@ -121,6 +123,11 @@ _objalloc_alloc (struct objalloc *o, unsigned long len) len = (len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1); + /* Check for overflow in the alignment operation above and the + malloc argument below. */ + if (len + CHUNK_HEADER_SIZE < original_len) + return NULL; + if (len <= o->current_space) { o->current_ptr += len; |