diff options
| author |   otto <otto@openbsd.org> | 2007-01-25 08:21:08 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2007-01-25 08:21:08 +0000 |
| commit | 7347534fb0c396c8f79e068d35b9f8ac1909933a (patch) | |
| tree | 8c0cf73af4465825372279728db1a5b84756379e | |
| parent | resolve conflicts with 9.3.4; SECURITY UPDATE (diff) | |
| download | wireguard-openbsd-7347534fb0c396c8f79e068d35b9f8ac1909933a.tar.xz wireguard-openbsd-7347534fb0c396c8f79e068d35b9f8ac1909933a.zip | |
do not use strlcpuy on a buffer filled by fgetln, since fgetln does
not NUL-terminate. ok xsa@
| -rw-r--r-- | usr.bin/cvs/config.c | 5 | ||||
| -rw-r--r-- | usr.bin/cvs/logmsg.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/cvs/config.c b/usr.bin/cvs/config.c index d413a25b162..7def6425acc 100644 --- a/usr.bin/cvs/config.c +++ b/usr.bin/cvs/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.6 2006/12/07 08:43:12 xsa Exp $ */ +/* $OpenBSD: config.c,v 1.7 2007/01/25 08:21:08 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -47,7 +47,8 @@ cvs_parse_configfile(void) buf[len - 1] = '\0'; } else { lbuf = xmalloc(len + 1); - strlcpy(lbuf, buf, len); + memcpy(lbuf, buf, len); + lbuf[len] = '\0'; buf = lbuf; } diff --git a/usr.bin/cvs/logmsg.c b/usr.bin/cvs/logmsg.c index 2bae1b6e69a..bc840647c1f 100644 --- a/usr.bin/cvs/logmsg.c +++ b/usr.bin/cvs/logmsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logmsg.c,v 1.35 2007/01/11 08:48:59 xsa Exp $ */ +/* $OpenBSD: logmsg.c,v 1.36 2007/01/25 08:21:08 otto Exp $ */ /* * Copyright (c) 2007 Joris Vink <joris@openbsd.org> * @@ -55,7 +55,8 @@ cvs_logmsg_read(const char *path) buf[len - 1] = '\0'; } else { lbuf = xmalloc(len + 1); - strlcpy(lbuf, buf, len); + memcpy(lbuf, buf, len); + lbuf[len] = '\0'; buf = lbuf; } |