diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/realpath.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20030517 | ||
2 | - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD) | ||
3 | |||
1 | 20030516 | 4 | 20030516 |
2 | - (djm) OpenBSD CVS Sync | 5 | - (djm) OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2003/05/15 13:52:10 | 6 | - djm@cvs.openbsd.org 2003/05/15 13:52:10 |
@@ -1549,4 +1552,4 @@ | |||
1549 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1552 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1550 | ok provos@ | 1553 | ok provos@ |
1551 | 1554 | ||
1552 | $Id: ChangeLog,v 1.2730 2003/05/16 08:21:01 djm Exp $ | 1555 | $Id: ChangeLog,v 1.2731 2003/05/18 01:22:43 mouring Exp $ |
diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c index b9035ca22..09b7b73bf 100644 --- a/openbsd-compat/realpath.c +++ b/openbsd-compat/realpath.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH) | 32 | #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH) |
33 | 33 | ||
34 | #if defined(LIBC_SCCS) && !defined(lint) | 34 | #if defined(LIBC_SCCS) && !defined(lint) |
35 | static char *rcsid = "$OpenBSD: realpath.c,v 1.7 2002/05/24 21:22:37 deraadt Exp $"; | 35 | static char *rcsid = "$OpenBSD: realpath.c,v 1.8 2003/04/04 22:47:43 hin Exp $"; |
36 | #endif /* LIBC_SCCS and not lint */ | 36 | #endif /* LIBC_SCCS and not lint */ |
37 | 37 | ||
38 | #include <sys/param.h> | 38 | #include <sys/param.h> |
@@ -148,8 +148,8 @@ loop: | |||
148 | goto err1; | 148 | goto err1; |
149 | } | 149 | } |
150 | if (rootd == 0) | 150 | if (rootd == 0) |
151 | (void)strcat(resolved, "/"); | 151 | strlcat(resolved, "/", MAXPATHLEN); |
152 | (void)strcat(resolved, wbuf); | 152 | strlcat(resolved, wbuf, MAXPATHLEN); |
153 | } | 153 | } |
154 | 154 | ||
155 | /* Go back to where we came from. */ | 155 | /* Go back to where we came from. */ |