osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

(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
This commit is contained in:
Jeff Morriss 2012-09-20 21:16:26 +00:00
parent 4faf909267
commit 93b1a4d511
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
file.c
View File

@ -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;