Sophie

Sophie

distrib > Mageia > 4 > x86_64 > by-pkgid > 42475f006d4789a3e56565f9becbe3f3 > files > 12

file-5.16-1.6.mga4.src.rpm

From c0c0032b9e9eb57b91fefef905a3b018bab492d9 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Fri, 21 Feb 2014 14:32:48 +0000
Subject: [PATCH] Fix memory leak (Anatol Belski)

---
 src/softmagic.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/softmagic.c b/src/softmagic.c
index 799e55c..170de95 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -1762,12 +1762,16 @@ private int mcopy(struct magic_set *, union VALUETYPE *, int, int,
 		ms->offset = soffset;
 		if (rv == 1) {
 			if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
-			    file_printf(ms, m->desc, offset) == -1)
+			    file_printf(ms, m->desc, offset) == -1) {
+				free(rbuf);
 				return -1;
-			if (file_printf(ms, "%s", rbuf) == -1)
+			}
+			if (file_printf(ms, "%s", rbuf) == -1) {
+				free(rbuf);
 				return -1;
-			free(rbuf);
+			}
 		}
+		free(rbuf);
 		return rv;
 
 	case FILE_USE:
-- 
1.8.5.5