Update xtoptions.c

splitice · splitice · commit 97b0b805e8f0 · 2025-11-06T15:17:34.000+11:00
diff --git a/ipthelper/xtoptions.c b/ipthelper/xtoptions.c
@@ -120,7 +120,8 @@ xtables_options_xfrm(struct option *orig_opts, struct option *oldopts,
 		memcpy(mp, oldopts, sizeof(*mp) * num_old);
 		mp += num_old;
 	}
-	xtables_free_opts(0);
+	if (xt_params->opts != NULL && xt_params->opts != xt_params->orig_opts)
+		xtables_free_opts(0);
 
 	/* Clear trailing entry */
 	memset(mp, 0, sizeof(*mp));

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ xtables_options_xfrm(struct option orig_opts, struct option oldopts,`
`120`	`120`	`memcpy(mp, oldopts, sizeof(mp) num_old);`
`121`	`121`	`mp += num_old;`
`122`	`122`	`}`
`123`		`- xtables_free_opts(0);`
	`123`	`+ if (xt_params->opts != NULL && xt_params->opts != xt_params->orig_opts)`
	`124`	`+ xtables_free_opts(0);`
`124`	`125`
`125`	`126`	`/* Clear trailing entry */`
`126`	`127`	`memset(mp, 0, sizeof(*mp));`