Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-27 01:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge from gcc

Browse Source
This commit is contained in:
DJ Delorie
2012-10-10 03:11:33 +00:00
parent fd49b9b373
commit 995b61fe5b
13 changed files with 202 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libiberty/objalloc.c
View File

@@ -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;