From: Jan Engelhardt <jengelh@medozas.de>
Date: Sun, 28 Nov 2010 14:42:00 +0000 (+0100)
Subject: iptables: do not emit orig_opts twice
X-Git-Tag: v1.4.11~112^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d68ae7ce6e40e3977ee11a57296cf76801ae320;p=thirdparty%2Fiptables.git

iptables: do not emit orig_opts twice

This just happened to cross my eye; there was no error, but fixing
this up saves a pitfall, and some memory.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---

diff --git a/xtables.c b/xtables.c
index d0aa8688..2137c98b 100644
--- a/xtables.c
+++ b/xtables.c
@@ -103,6 +103,10 @@ struct option *xtables_merge_options(struct option *orig_opts,
 	memcpy(merge, orig_opts, sizeof(*mp) * num_oold);
 	mp = merge + num_oold;
 
+	/* Since @opts also has @orig_opts already, skip the entries */
+	oldopts += num_oold;
+	num_old -= num_oold;
+
 	/* Second, the new options */
 	xt_params->option_offset += 256;
 	*option_offset = xt_params->option_offset;