From: Michal Marek <mmarek@suse.cz>
Date: Wed, 16 Jan 2013 16:51:57 +0000 (+0100)
Subject: libkmod-module: Do not free the list in kmod_module_info_append
X-Git-Tag: v13~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6333934e27934a4d8d7dde729e965fab7f2c416b;p=thirdparty%2Fkmod.git

libkmod-module: Do not free the list in kmod_module_info_append

In error case, just return NULL and let the caller free the list.
---

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index 176a5a88..2f4acd57 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -2100,16 +2100,13 @@ static struct kmod_list *kmod_module_info_append(struct kmod_list **list, const
 	struct kmod_list *n;
 
 	info = kmod_module_info_new(key, keylen, value, valuelen);
-	if (info == NULL) {
-		kmod_module_info_free_list(*list);
+	if (info == NULL)
 		return NULL;
-	}
 	n = kmod_list_append(*list, info);
-	if (n == NULL) {
+	if (n != NULL)
+		*list = n;
+	else
 		kmod_module_info_free(info);
-		kmod_module_info_free_list(*list);
-	}
-	*list = n;
 	return n;
 }
 
@@ -2171,6 +2168,10 @@ KMOD_EXPORT int kmod_module_get_info(const struct kmod_module *mod, struct kmod_
 	ret = count;
 
 list_error:
+	if (ret < 0) {
+		kmod_module_info_free_list(*list);
+		*list = NULL;
+	}
 	free(strings);
 	return ret;
 }