From 2a3f1a4f6724c061f47a0266e157e6d84aa65c7d Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 29 Apr 2017 04:28:53 -0700 Subject: 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 --- file.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'file.c') 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) { -- cgit v1.2.3