X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=libiberty%2Fxmemdup.c;h=4602afd7d9f6acb5e1bc57c2bd5ac3da4e25d5aa;hb=97f50151221de0a023a8317559b1992a90f9cb8f;hp=0dae37d89235c9d6646c459fa551c931d20235b7;hpb=51e32d644ad69408eacefacd21e015a6c9c519c2;p=deliverable%2Fbinutils-gdb.git diff --git a/libiberty/xmemdup.c b/libiberty/xmemdup.c index 0dae37d892..4602afd7d9 100644 --- a/libiberty/xmemdup.c +++ b/libiberty/xmemdup.c @@ -1,10 +1,11 @@ -/* 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. */ /* -@deftypefn Replacement void* xmemdup (void *@var{input}, size_t @var{copy_size}, size_t @var{alloc_size}) +@deftypefn Replacement void* xmemdup (void *@var{input}, @ + size_t @var{copy_size}, size_t @var{alloc_size}) Duplicates a region of memory without fail. First, @var{alloc_size} bytes are allocated, then @var{copy_size} bytes from @var{input} are copied into @@ -31,11 +32,10 @@ allocated, the remaining memory is zeroed. #endif PTR -xmemdup (input, copy_size, alloc_size) - const PTR input; - size_t copy_size; - size_t alloc_size; +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); }