diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 289617b2690..d6b200e0ef2 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2016-05-31 Alan Modra + + * xmemdup.c (xmemdup): Use xmalloc rather than xcalloc. + 2016-05-19 Jakub Jelinek PR c++/70498 diff --git a/libiberty/xmemdup.c b/libiberty/xmemdup.c index aa56f0bf572..4602afd7d9f 100644 --- a/libiberty/xmemdup.c +++ b/libiberty/xmemdup.c @@ -1,4 +1,4 @@ -/* xmemdup.c -- Duplicate a memory buffer, using xcalloc. +/* xmemdup.c -- Duplicate a memory buffer, using xmalloc. This trivial function is in the public domain. Jeff Garzik, September 1999. */ @@ -34,6 +34,8 @@ allocated, the remaining memory is zeroed. PTR xmemdup (const PTR input, size_t copy_size, size_t alloc_size) { - PTR output = xcalloc (1, alloc_size); + PTR output = xmalloc (alloc_size); + if (alloc_size > copy_size) + memset ((char *) output + copy_size, 0, alloc_size - copy_size); return (PTR) memcpy (output, input, copy_size); }