From 93b1a4d5111f257348981c1d715ea0563eaa604f Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Thu, 20 Sep 2012 21:16:26 +0000 Subject: [PATCH] (Try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5808 : Use and free err_info in cf_continue_tail() and cf_finish_tail(). (Untested because I'm not sure how to corrupt a file to exercise this code path...) svn path=/trunk/; revision=45032 --- file.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/file.c b/file.c index 333b298143..c04b336b9f 100644 --- a/file.c +++ b/file.c @@ -860,8 +860,9 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err) } else if (*err != 0) { /* We got an error reading the capture file. XXX - pop up a dialog box instead? */ - g_warning("Error \"%s\" while reading: \"%s\"\n", - wtap_strerror(*err), cf->filename); + g_warning("Error \"%s\" while reading: \"%s\" (\"%s\")", + wtap_strerror(*err), err_info, cf->filename); + g_free(err_info); return CF_READ_ERROR; } else @@ -958,6 +959,10 @@ cf_finish_tail(capture_file *cf, int *err) if (*err != 0) { /* We got an error reading the capture file. XXX - pop up a dialog box? */ + + g_warning("Error \"%s\" while reading: \"%s\" (\"%s\")", + wtap_strerror(*err), err_info, cf->filename); + g_free(err_info); return CF_READ_ERROR; } else { return CF_READ_OK;