From 659c14068310f73d48609268515136217fb24073 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Thu, 5 Sep 2013 12:45:42 +0000 Subject: [PATCH 1/4] From Peter Hatina via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9104 Fix double-free on corrupt netmon file. Wiretap frees the struct for us, we don't need to free it as well. svn path=/trunk-1.8/; revision=51781 --- wiretap/netmon.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 87d177a..58b8865 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -337,14 +337,12 @@ int netmon_open(wtap *wth, int *err, gchar **err_info) *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("netmon: frame table length is %u, which is not a multiple of the size of an entry", frame_table_length); - g_free(netmon); return -1; } if (frame_table_size == 0) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("netmon: frame table length is %u, which means it's less than one entry in size", frame_table_length); - g_free(netmon); return -1; } /* @@ -364,11 +362,9 @@ int netmon_open(wtap *wth, int *err, gchar **err_info) *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("netmon: frame table length is %u, which is larger than we support", frame_table_length); - g_free(netmon); return -1; } if (file_seek(wth->fh, frame_table_offset, SEEK_SET, err) == -1) { - g_free(netmon); return -1; } frame_table = (guint32 *)g_malloc(frame_table_length); -- 1.7.10.4