From: Lukasz Majewski <l.majewski@majess.pl>
Date: Sun, 13 Sep 2015 22:57:04 +0000 (+0200)
Subject: env: import: hashtable: Free memory allocated before exiting from himport_r()
X-Git-Tag: v2015.10-rc4~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0226d8780b3886a4acdd2d4c9731419306d470f6;p=oweals%2Fu-boot.git

env: import: hashtable: Free memory allocated before exiting from himport_r()

ithout this patch memory is not released on early exit.

Signed-off-by: Lukasz Majewski <l.majewski@majess.pl>
---

diff --git a/lib/hashtable.c b/lib/hashtable.c
index 7df424ad87..02b41050a4 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -842,8 +842,10 @@ int himport_r(struct hsearch_data *htab,
 		}
 	}
 
-	if(!size)
+	if (!size) {
+		free(data);
 		return 1;		/* everything OK */
+	}
 	if(crlf_is_lf) {
 		/* Remove Carriage Returns in front of Line Feeds */
 		unsigned ignored_crs = 0;
@@ -907,6 +909,7 @@ int himport_r(struct hsearch_data *htab,
 		if (*name == 0) {
 			debug("INSERT: unable to use an empty key\n");
 			__set_errno(EINVAL);
+			free(data);
 			return 0;
 		}