From: Mark Wielaard <mjw@redhat.com>
Date: Sat, 30 May 2015 21:50:14 +0000 (+0200)
Subject: libelf: Don't call memmove with possible NULL buffer.
X-Git-Tag: elfutils-0.162~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc9b79400a7bf1aa399cadf5e0351d757a4e44a6;p=thirdparty%2Felfutils.git

libelf: Don't call memmove with possible NULL buffer.

When size is zero the buffer src and dest buffers might be NULL.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index b8c20cc68..b749c0851 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-30  Mark Wielaard  <mjw@redhat.com>
+
+	* gelf_xlate.c (elf_cvt_Byte): Only call memmove with non-zero size.
+
 2015-05-30  Mark Wielaard  <mjw@redhat.com>
 
 	* elf32_updatefile.c (updatemmap): Only call mempcpy and update
diff --git a/libelf/gelf_xlate.c b/libelf/gelf_xlate.c
index c417051a3..c5805e736 100644
--- a/libelf/gelf_xlate.c
+++ b/libelf/gelf_xlate.c
@@ -1,5 +1,5 @@
 /* Transformation functions for ELF data types.
-   Copyright (C) 1998,1999,2000,2002,2004,2005,2006,2007 Red Hat, Inc.
+   Copyright (C) 1998,1999,2000,2002,2004,2005,2006,2007,2015 Red Hat, Inc.
    This file is part of elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 1998.
 
@@ -52,7 +52,8 @@ static void
 (elf_cvt_Byte) (void *dest, const void *src, size_t n,
 		int encode __attribute__ ((unused)))
 {
-  memmove (dest, src, n);
+  if (n != 0)
+    memmove (dest, src, n);
 }