From: Christos Zoulas <christos@zoulas.com>
Date: Fri, 21 Feb 2014 14:32:48 +0000 (+0000)
Subject: Fix memory leak (Anatol Belski)
X-Git-Tag: FILE5_18~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0c0032b9e9eb57b91fefef905a3b018bab492d9;p=file

Fix memory leak (Anatol Belski)
---

diff --git a/src/softmagic.c b/src/softmagic.c
index 799e55c0..170de959 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: softmagic.c,v 1.175 2014/02/18 11:09:31 kim Exp $")
+FILE_RCSID("@(#)$File: softmagic.c,v 1.176 2014/02/18 17:59:21 kim Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -1762,12 +1762,16 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
 		ms->offset = soffset;
 		if (rv == 1) {
 			if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
-			    file_printf(ms, F(m->desc, "%u"), offset) == -1)
+			    file_printf(ms, F(m->desc, "%u"), 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: