aboutsummaryrefslogtreecommitdiffstats
path: root/ws80211_utils.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-07-09 01:56:27 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-07-09 01:56:27 +0000
commit45e9efc6a915f8c5b7874911c8836c9b7fdda7f5 (patch)
tree980adfbed6d1bac14a195b620b72da7c909378e9 /ws80211_utils.c
parent1ae38887b67ecf14e4c36ca9817d2941b3b73f7b (diff)
From Evan Huus:
Fix leaks - don't g_strdup a string just to use it in a g_strdup_printf - clean up properly in error cases in lua bindings - misc. other missing g_free() calls - one missing fclose() in the new 80211_utils https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7454 svn path=/trunk/; revision=43617
Diffstat (limited to 'ws80211_utils.c')
-rw-r--r--ws80211_utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ws80211_utils.c b/ws80211_utils.c
index 5131f03bd7..8dde38e16e 100644
--- a/ws80211_utils.c
+++ b/ws80211_utils.c
@@ -207,9 +207,8 @@ static int get_phys_handler(struct nl_msg *msg, void *arg)
iface->channel_types = 1 << WS80211_CHAN_NO_HT;
if (tb_msg[NL80211_ATTR_WIPHY_NAME]) {
- char *phyname;
- phyname = g_strdup(nla_get_string(tb_msg[NL80211_ATTR_WIPHY_NAME]));
- iface->ifname = g_strdup_printf("%s.mon", phyname);
+ iface->ifname = g_strdup_printf("%s.mon",
+ nla_get_string(tb_msg[NL80211_ATTR_WIPHY_NAME]));
}
nla_for_each_nested(nl_band, tb_msg[NL80211_ATTR_WIPHY_BANDS], rem_band) {
@@ -420,6 +419,7 @@ static int ws80211_populate_devices(GArray *interfaces)
ret = fgets(line, sizeof(line), fh);
if (ret == NULL) {
fprintf(stderr, "Error parsing /proc/net/dev");
+ fclose(fh);
return -1;
}
}