summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchip <chip>2003-06-10 15:17:32 +0000
committerchip <chip>2003-06-10 15:17:32 +0000
commit1486c0972d17f2e213b1005e0ef1dfd91f4a155a (patch)
tree618cc49245e632aeed56e9397f513eb145ec672a
parent9d5ca9a5de5b2055301051501df540fc6cf17f8e (diff)
downloadnfs-utils-1486c0972d17f2e213b1005e0ef1dfd91f4a155a.tar.gz
nfs-utils-1486c0972d17f2e213b1005e0ef1dfd91f4a155a.tar.xz
nfs-utils-1486c0972d17f2e213b1005e0ef1dfd91f4a155a.zip
2003-06-10 Chip Salzenberg <chip@pobox.com>
* support/nfs/xlog.c (xlog): Fix off-by-one buffer overflow bug. * debian/changelog: Version 1.0.3-2.
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog7
-rw-r--r--support/nfs/xlog.c4
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b93669..0c3295c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-10 Chip Salzenberg <chip@pobox.com>
+
+ * support/nfs/xlog.c (xlog): Fix off-by-one buffer overflow bug.
+ * debian/changelog: Version 1.0.3-2.
+
2003-05-30 Michael Griffith <grif@michaelgriffith.com>
NeilBrown <neilb@cse.unsw.edu.au>
diff --git a/debian/changelog b/debian/changelog
index ff84c2a..12e2886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.0.3-2) unstable; urgency=high
+
+ * Upstream CVS sync:
+ > Fix one-byte buffer overflow in logging code.
+
+ -- Chip Salzenberg <chip@debian.org> Tue, 10 Jun 2003 11:11:56 -0400
+
nfs-utils (1:1.0.3-1) unstable; urgency=low
* New upstream version:
diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c
index 90c7e63..c4e7ea1 100644
--- a/support/nfs/xlog.c
+++ b/support/nfs/xlog.c
@@ -142,9 +142,9 @@ xlog(int kind, const char *fmt, ...)
return;
va_start(args, fmt);
- vsnprintf(buff, sizeof (buff), fmt, args);
+ vsnprintf(buff, sizeof (buff) - 2, fmt, args);
va_end(args);
- buff[sizeof (buff) - 1] = 0;
+ buff[sizeof (buff) - 2] = 0;
if ((n = strlen(buff)) > 0 && buff[n-1] != '\n') {
buff[n++] = '\n'; buff[n++] = '\0';