diff options
author | Michael Mann <mmann78@netscape.net> | 2015-01-11 21:32:53 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-01-16 15:25:18 +0000 |
commit | ada1eec702ff44dc89670a1aa25c1e34d370bebb (patch) | |
tree | cb754fdadbad9312340bbbc2e0a13d4ff71d2349 /ui | |
parent | 260b19e98d02b92afe9a1d361fa6f98b3a63efb4 (diff) |
SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS
Copy addresses with wmem-scope instead of (forced) seasonal scope. All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes.
Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2
Reviewed-on: https://code.wireshark.org/review/6564
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/gtk/wlan_stat_dlg.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index 3d328d8ac3..e364a522a4 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -147,6 +147,7 @@ dealloc_wlan_details_ep (wlan_details_ep_t *details) while (details) { tmp = details; details = details->next; + g_free ((void*)tmp->addr.data); g_free (tmp); } } @@ -206,6 +207,7 @@ wlanstat_reset (void *phs) tmp = list; dealloc_wlan_details_ep(tmp->details); list = tmp->next; + g_free((void*)tmp->bssid.data); g_free(tmp); } @@ -239,7 +241,7 @@ alloc_wlan_ep (const struct _wlan_hdr *si, const packet_info *pinfo _U_) ep = (wlan_ep_t *)g_malloc (sizeof(wlan_ep_t)); - SE_COPY_ADDRESS (&ep->bssid, &si->bssid); + COPY_ADDRESS (&ep->bssid, &si->bssid); ep->stats.channel = si->stats.channel; memcpy (ep->stats.ssid, si->stats.ssid, MAX_SSID_LEN); ep->stats.ssid_len = si->stats.ssid_len; @@ -266,7 +268,7 @@ alloc_wlan_details_ep (const address *addr) if (!(d_ep = (wlan_details_ep_t *)g_malloc (sizeof(wlan_details_ep_t)))) return NULL; - SE_COPY_ADDRESS (&d_ep->addr, addr); + COPY_ADDRESS (&d_ep->addr, addr); d_ep->probe_req = 0; d_ep->probe_rsp = 0; d_ep->auth = 0; @@ -454,7 +456,8 @@ wlanstat_packet (void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const v if (tmp->iter_valid) { gtk_list_store_remove(store, &tmp->iter); } - g_free (tmp); + g_free((void*)tmp->bssid.data); + g_free(tmp); break; } prev = tmp; |