From: Jan Engelhardt <jengelh@medozas.de>
To: kaber@trash.net
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 4/7] xtables: set custom opts to NULL on free
Date: Mon, 31 Jan 2011 03:12:49 +0100 [thread overview]
Message-ID: <1296439973-16089-5-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1296439973-16089-1-git-send-email-jengelh@medozas.de>
When inside ip6tables-restore, xtables_free_opts can be called
multiple times, especially when trying to exit with an error message
from outside do_command. So set it to NULL so that we do not attempt
to free a dangling pointer.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
xtables.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/xtables.c b/xtables.c
index 0036299..be103d7 100644
--- a/xtables.c
+++ b/xtables.c
@@ -75,8 +75,10 @@ void basic_exit_err(enum xtables_exittype status, const char *msg, ...)
void xtables_free_opts(int unused)
{
- if (xt_params->opts != xt_params->orig_opts)
+ if (xt_params->opts != xt_params->orig_opts) {
free(xt_params->opts);
+ xt_params->opts = NULL;
+ }
}
struct option *xtables_merge_options(struct option *orig_opts,
--
1.7.1
next prev parent reply other threads:[~2011-01-31 2:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-31 2:12 iptables: misc fixes Jan Engelhardt
2011-01-31 2:12 ` [PATCH 1/7] libxt_quota: clarifications on matching Jan Engelhardt
2011-01-31 2:12 ` [PATCH 2/7] iptables: improve error reporting with extension loading troubles Jan Engelhardt
2011-01-31 2:12 ` [PATCH 3/7] libxt_u32: enclose argument in quotes Jan Engelhardt
2011-01-31 2:12 ` Jan Engelhardt [this message]
2011-01-31 2:12 ` [PATCH 5/7] iptables: warn when parameter limit is exceeded Jan Engelhardt
2011-01-31 2:12 ` [PATCH 6/7] iptables: remove bogus address-of Jan Engelhardt
2011-01-31 2:12 ` [PATCH 7/7] iptables: remove more redundant casts Jan Engelhardt
2011-01-31 2:16 ` [PATCH 8/8] iptables: do not print trailing whitespaces Jan Engelhardt
2011-01-31 16:12 ` iptables: misc fixes Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296439973-16089-5-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).