fix memory leak(s) in libiptc. Reverts the previous (wrong) patch. (Martin Josefsson)

1 files changed, 7 insertions, 1 deletions

diff --git a/iptables.c b/iptables.c
index a3bcc786..d181578c 100644
--- a/iptables.c
+++ b/iptables.c
@@ -1668,6 +1668,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
 	char *protocol = NULL;
 	const char *modprobe = NULL;
 	int proto_used = 0;
+	int no_handle = 0;
 
 	memset(&fw, 0, sizeof(fw));
 
@@ -2148,8 +2149,10 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
 			   chain, IPT_FUNCTION_MAXNAMELEN);
 
 	/* only allocate handle if we weren't called with a handle */
-	if (!*handle)
+	if (!*handle) {
 		*handle = iptc_init(*table);
+		no_handle = 1;
+	}
 
 	if (!*handle) {
 		/* try to insmod the module if iptc_init failed */
@@ -2294,5 +2297,8 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
 	if (verbose > 1)
 		dump_entries(*handle);
 
+	if (no_handle)
+		iptc_free(handle);
+
 	return ret;
 }