projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubsan: xgate: left shift of negative value
[deliverable/binutils-gdb.git]
/
libiberty
/
objalloc.c
diff --git
a/libiberty/objalloc.c
b/libiberty/objalloc.c
index a06047d00f619e9941a71480a31255fe4528d170..f6c65a2f71f5a1a99b0f086040782212ed493a52 100644
(file)
--- a/
libiberty/objalloc.c
+++ b/
libiberty/objalloc.c
@@
-1,5
+1,5
@@
/* objalloc.c -- routines to allocate memory for objects
/* objalloc.c -- routines to allocate memory for objects
- Copyright
1997
Free Software Foundation, Inc.
+ Copyright
(C) 1997-2019
Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Solutions.
This program is free software; you can redistribute it and/or modify it
Written by Ian Lance Taylor, Cygnus Solutions.
This program is free software; you can redistribute it and/or modify it
@@
-14,8
+14,8
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, 5
9 Temple Place - Suite 330
,
-Boston, MA 0211
1-1307
, USA. */
+Foundation, 5
1 Franklin Street - Fifth Floor
,
+Boston, MA 0211
0-1301
, USA. */
#include "config.h"
#include "ansidecl.h"
#include "config.h"
#include "ansidecl.h"
@@
-30,10
+30,8
@@
Boston, MA 02111-1307, USA. */
#include <unixlib.h>
#else
#include <unixlib.h>
#else
-#ifdef ANSI_PROTOTYPES
/* Get a definition for size_t. */
#include <stddef.h>
/* Get a definition for size_t. */
#include <stddef.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@
-114,8
+112,10
@@
objalloc_create (void)
/* Allocate space from an objalloc structure. */
PTR
/* 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)
/* We avoid confusion from zero sized objects by always allocating
at least 1 byte. */
if (len == 0)
@@
-123,6
+123,11
@@
_objalloc_alloc (struct objalloc *o, unsigned long len)
len = (len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);
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;
if (len <= o->current_space)
{
o->current_ptr += len;
This page took
0.026935 seconds
and
4
git commands to generate.