summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-08-03 12:02:15 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-08-03 12:02:15 +0000
commit15a399d338210b4adeb88612b01777c836ab1fcb (patch)
treec0180c6bb5f2334063e305f061d55b8280fdaba1
parent4b09c250497290e62a4312e64940a468f57649dc (diff)
downloadwireshark-15a399d338210b4adeb88612b01777c836ab1fcb.tar.gz
Replace calls to sprintf() with snprintf() in file_*_error_message routines,
as a long filename may overflow the buffer. svn path=/trunk/; revision=2199
-rw-r--r--file.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/file.c b/file.c
index 5cd6a978ce..f21ffa50c0 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
- * $Id: file.c,v 1.201 2000/07/26 03:08:56 gram Exp $
+ * $Id: file.c,v 1.202 2000/08/03 12:02:15 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1884,7 +1884,8 @@ file_open_error_message(int err, gboolean for_writing)
break;
default:
- sprintf(errmsg_errno, "The file \"%%s\" could not be opened: %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "The file \"%%s\" could not be opened: %s.",
wtap_strerror(err));
errmsg = errmsg_errno;
break;
@@ -1909,7 +1910,8 @@ file_rename_error_message(int err)
break;
default:
- sprintf(errmsg_errno, "The file \"%%s\" could not be moved: %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "The file \"%%s\" could not be moved: %s.",
wtap_strerror(err));
errmsg = errmsg_errno;
break;
@@ -1922,7 +1924,8 @@ file_read_error_message(int err)
{
static char errmsg_errno[1024+1];
- sprintf(errmsg_errno, "An error occurred while reading from the file \"%%s\": %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "An error occurred while reading from the file \"%%s\": %s.",
wtap_strerror(err));
return errmsg_errno;
}
@@ -1946,7 +1949,8 @@ file_write_error_message(int err)
#endif
default:
- sprintf(errmsg_errno, "An error occurred while writing to the file \"%%s\": %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "An error occurred while writing to the file \"%%s\": %s.",
wtap_strerror(err));
errmsg = errmsg_errno;
break;
@@ -1985,7 +1989,8 @@ file_close_error_message(int err)
#endif
default:
- sprintf(errmsg_errno, "An error occurred while closing the file \"%%s\": %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "An error occurred while closing the file \"%%s\": %s.",
wtap_strerror(err));
errmsg = errmsg_errno;
break;