summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2016-04-14 21:02:39 +0200
committerMark Wielaard <mjw@redhat.com>2016-04-14 21:08:30 +0200
commitf7f45ed580029d80e6cf5bcfa5d5445af797e363 (patch)
treeac5c524b273c5ebe2ecc6473ccc0eb4c4fba8c41
parent836a16fe5b5bab4a3afe2c991c104652775ce3a3 (diff)
downloadelfutils-f7f45ed580029d80e6cf5bcfa5d5445af797e363.tar.gz
libelf: Fix memory leak when zlib deflateInit fails in elf_compress.
On error we return NULL, not out_buf. So make sure to not leak it. Signed-off-by: Mark Wielaard <mjw@redhat.com>
-rw-r--r--libelf/ChangeLog5
-rw-r--r--libelf/elf_compress.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 350e4eb1..668687db 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-14 Mark Wielaard <mjw@redhat.com>
+
+ * elf_compress.c (__libelf_compress): Free out_buf if deflateInit
+ fails.
+
2016-02-13 Mark Wielaard <mjw@redhat.com>
* elf32_updatefile.c (updatemmap): Free scns when out of memory.
diff --git a/libelf/elf_compress.c b/libelf/elf_compress.c
index 4c7c35e1..10574eae 100644
--- a/libelf/elf_compress.c
+++ b/libelf/elf_compress.c
@@ -117,6 +117,7 @@ __libelf_compress (Elf_Scn *scn, size_t hsize, int ei_data,
int zrc = deflateInit (&z, Z_BEST_COMPRESSION);
if (zrc != Z_OK)
{
+ free (out_buf);
__libelf_seterrno (ELF_E_COMPRESS_ERROR);
return NULL;
}