This is the mail archive of the elfutils-devel@sourceware.org mailing list for the elfutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH 3/4] 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>
---
 libelf/ChangeLog    | 4 ++++
 libelf/gelf_xlate.c | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index b8c20cc..b749c08 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,5 +1,9 @@
 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
 	last_position when d_size is non-zero.
 
diff --git a/libelf/gelf_xlate.c b/libelf/gelf_xlate.c
index c417051..c5805e7 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);
 }
 
 
-- 
2.1.0


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]