aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-29 04:28:53 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-29 11:29:34 +0000
commit2a3f1a4f6724c061f47a0266e157e6d84aa65c7d (patch)
treebdb778c127d6cb73751c7bfc2766a6ba1cecac0d /file.c
parente3f49280deb11a7055083634fbbc4d8416fce024 (diff)
Eliminate some double-frees.
The cfile_ error-reporting routines free err_info; the caller doesn't have to and, in fact, mustn't do so themselves. While we're at it, make sure wtap_seek_read() always zeroes out *err and nulls out *err_info, so the latter either points to a freshly-allocated string or is null. Change-Id: Idfe05a3ba2fbf2647ba14e483187617ee53e3c69 Reviewed-on: https://code.wireshark.org/review/21407 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/file.c b/file.c
index 72771c46be..f5e39f6581 100644
--- a/file.c
+++ b/file.c
@@ -1411,8 +1411,6 @@ cf_merge_files_to_tempfile(gpointer pd_window, char **out_filenamep,
break;
}
- g_free(err_info);
-
cf_callback_invoke(cf_cb_file_merge_finished, NULL);
if (status != MERGE_OK) {