diff options
-rw-r--r-- | libiberty/ChangeLog | 4 | ||||
-rw-r--r-- | libiberty/xmemdup.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 358a6b0..c55af15 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2016-05-31 Alan Modra <amodra@gmail.com> + + * xmemdup.c (xmemdup): Use xmalloc rather than xcalloc. + 2016-01-27 Iain Buclaw <ibuclaw@gdcproject.org> * d-demangle.c (dlang_call_convention): Handle extern Objective-C diff --git a/libiberty/xmemdup.c b/libiberty/xmemdup.c index aa56f0b..4602afd 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); } |