From 2d68ae7ce6e40e3977ee11a57296cf76801ae320 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 28 Nov 2010 15:42:00 +0100 Subject: 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 --- xtables.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'xtables.c') 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; -- cgit v1.2.3