diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2001-02-01 08:33:04 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2001-02-01 08:33:04 +0000 |
| commit | 28faf0cb193686b44ca7b83b2ce60ddae0c6a65a (patch) | |
| tree | c84935298b7b9a4a016ca36bdb9fc8b020e01ffc /ftp/spegla | |
| parent | Upgrade to 1.8.2. (diff) | |
Fix \0 termination at %s substitution for configfile.
Be sure vsnprintf() may return value which is larger than buffer length.
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=37868
Diffstat (limited to 'ftp/spegla')
| -rw-r--r-- | ftp/spegla/files/patch-e_err.c | 10 | ||||
| -rw-r--r-- | ftp/spegla/files/patch-spegla.c | 10 |
2 files changed, 19 insertions, 1 deletions
diff --git a/ftp/spegla/files/patch-e_err.c b/ftp/spegla/files/patch-e_err.c new file mode 100644 index 000000000000..f75ebc1b81c0 --- /dev/null +++ b/ftp/spegla/files/patch-e_err.c @@ -0,0 +1,10 @@ +--- e_err.c.orig Sun May 14 23:39:39 2000 ++++ e_err.c Thu Feb 1 15:38:37 2001 +@@ -115,6 +115,7 @@ + } + + res = vsnprintf(p, len, fmt, args); ++ if (res >= len) res = len - 1; + len -= res; + p += res; + diff --git a/ftp/spegla/files/patch-spegla.c b/ftp/spegla/files/patch-spegla.c index 2af5159fbf9c..a0a7f2af1c5c 100644 --- a/ftp/spegla/files/patch-spegla.c +++ b/ftp/spegla/files/patch-spegla.c @@ -1,5 +1,5 @@ --- spegla.c.orig Sat May 27 22:38:14 2000 -+++ spegla.c Fri Jan 19 19:36:43 2001 ++++ spegla.c Thu Feb 1 15:39:24 2001 @@ -728,7 +728,7 @@ #ifdef ULTRIX if ((f.fd_req.bfreen * 1024) < minfree) @@ -9,3 +9,11 @@ #endif e_errx(1, "%s: Not enough space left", path); +@@ -953,6 +953,7 @@ + } + buf[i] = p[j]; + } ++ buf[i] = '\0'; + *val = buf; + ret: + if (show) |