* [PATCH] linux_inet_diag: annotate memory freeing on diag errors
@ 2014-09-07 7:12 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2014-09-07 7:12 UTC (permalink / raw)
To: raindrops
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-07 7:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-07 7:12 [PATCH] linux_inet_diag: annotate memory freeing on diag errors Eric Wong
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).