osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

The "fname" argument to "save_cap_file()", and "cf->filename" - and thus 

"from_filename" - are both null-terminated strings; compare them with
"strcmp", not "strncmp()".  ("cf->filename" is a "char *", so
"sizeof(cf->filename)" is not the right third argument to "strncmp()" in
any case, as it's the size of a pointer, which is probably either 4 or 8
bytes.)

Make the dialog box for "Can't save over current capture file" an
ESD_TYPE_CRIT dialog box, as it's a fatal error.

svn path=/trunk/; revision=5526
This commit is contained in:
Guy Harris 2002-05-23 06:10:56 +00:00
parent e2630eed79
commit a0b8690230
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
file.c
View File

@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
* $Id: file.c,v 1.272 2002/05/03 21:55:12 guy Exp $
* $Id: file.c,v 1.273 2002/05/23 06:10:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1782,20 +1782,19 @@ save_cap_file(char *fname, capture_file *cf, gboolean save_filtered, gboolean sa
from_filename = cf->filename;
}
/* Check that the from file is not the same as to file */
if (do_copy) {
/* Check that the from file is not the same as to file */
if (strcmp(from_filename, fname) == 0) {
simple_dialog(ESD_TYPE_CRIT, NULL,
"Can't save over current capture file: %s!",
from_filename);
goto done;
}
/* Copy the file, if we haven't moved it. */
if (strncmp(from_filename, fname, sizeof(cf->filename)) == 0) {
simple_dialog(ESD_TYPE_WARN, NULL,
"Can't save over current capture file: %s!", from_filename);
goto done;
}
if (!copy_binary_file(from_filename, fname)) {
goto done;
}
/* Copy the file, if we haven't moved it. */
if (!copy_binary_file(from_filename, fname)) {
goto done;
}
}
} else {
/* Either we're filtering packets, or we're saving in a different