--- a/sysdeps/bfd/libiberty/objalloc.c	2012/03/06 15:51:48	184997

+++ b/sysdeps/bfd/libiberty/objalloc.c	2012/09/18 08:34:05	191413

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

@@ -114,10 +114,9 @@

 /* Allocate space from an objalloc structure.  */

 PTR

-_objalloc_alloc (o, len)

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

   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;