From: Eric Wong <normalperson@yhbt.net>
To: raindrops@librelist.org
Subject: [PATCH] linux_inet_diag: annotate memory freeing on diag errors
Date: Sun, 7 Sep 2014 07:12:06 +0000 [thread overview]
Message-ID: <20140907071206.GA30143@dcvr.yhbt.net> (raw)
In-Reply-To: <20140907071206.GA30143@dcvr.yhbt.net>
Clarify the code so memory leak alarms in reviewers eyes do not go off.
---
ext/raindrops/linux_inet_diag.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/ext/raindrops/linux_inet_diag.c b/ext/raindrops/linux_inet_diag.c
index e4d0fab..773e094 100644
--- a/ext/raindrops/linux_inet_diag.c
+++ b/ext/raindrops/linux_inet_diag.c
@@ -465,12 +465,12 @@ static VALUE diag(void *ptr)
}
}
out:
- {
+ /* prepare to raise, free memory before reacquiring GVL */
+ if (err && args->table) {
int save_errno = errno;
- if (err && args->table) {
- st_foreach(args->table, st_free_data, 0);
- st_free_table(args->table);
- }
+
+ st_foreach(args->table, st_free_data, 0);
+ st_free_table(args->table);
errno = save_errno;
}
return (VALUE)err;
@@ -584,6 +584,10 @@ static void gen_bytecode(struct iovec *iov, union any_addr *inet)
}
}
+/*
+ * n.b. we may safely raise here because an error will cause diag()
+ * to free args->table
+ */
static void nl_errcheck(VALUE r)
{
const char *err = (const char *)r;
--
EW
parent reply other threads:[~2014-09-07 7:12 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20140907071206.GA30143@dcvr.yhbt.net>]
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
List information: https://yhbt.net/raindrops/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140907071206.GA30143@dcvr.yhbt.net \
--to=normalperson@yhbt.net \
--cc=raindrops@librelist.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.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/raindrops.git/
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 read-only IMAP folder(s) and NNTP newsgroup(s).