diff options
| author | Paul Janzen <pjanzen@cvs.openbsd.org> | 2001-06-25 04:08:36 +0000 |
|---|---|---|
| committer | Paul Janzen <pjanzen@cvs.openbsd.org> | 2001-06-25 04:08:36 +0000 |
| commit | 16f93bdbf8cdb917f70f3596bb9a573c6a6cae69 (patch) | |
| tree | 1c093c60c2129b769938ed439892a153847884c3 /usr.sbin | |
| parent | 4adf18f7131d3e1444e46c6c799d21dcf9331d79 (diff) | |
A little more careful with buffers, only relevant if /etc/printcap was set
up insanely wrong.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/lpr/lpc/cmds.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c index 8c04c7d4dcb..188afad532a 100644 --- a/usr.sbin/lpr/lpc/cmds.c +++ b/usr.sbin/lpr/lpc/cmds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmds.c,v 1.11 2001/06/22 15:27:20 lebel Exp $ */ +/* $OpenBSD: cmds.c,v 1.12 2001/06/25 04:08:35 pjanzen Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: cmds.c,v 1.11 2001/06/22 15:27:20 lebel Exp $"; +static char rcsid[] = "$OpenBSD: cmds.c,v 1.12 2001/06/25 04:08:35 pjanzen Exp $"; #endif #endif /* not lint */ @@ -324,6 +324,10 @@ cleanpr() for (lp = line, cp = SD; (lp - line) < sizeof(line) && (*lp++ = *cp++);) ; lp[-1] = '/'; + if (lp - line >= sizeof(line)) { + printf("\tspool directory name too long\n"); + return; + } seteuid(euid); nitems = scandir(SD, &queue, doselect, sortq); @@ -347,8 +351,11 @@ cleanpr() n++; } if (n == 0) { - strlcpy(lp, cp, sizeof(line) - strlen(line)); - unlinkf(line); + if (strlcpy(lp, cp, sizeof(line) - (lp - line)) >= + sizeof(line) - (lp - line)) + printf("\tpath too long, %s/%s", SD, cp); + else + unlinkf(line); } } else { /* @@ -356,8 +363,11 @@ cleanpr() * been skipped above) or a tf file (which can always * be removed). */ - strlcpy(lp, cp, sizeof(line) - strlen(line)); - unlinkf(line); + if (strlcpy(lp, cp, sizeof(line) - (lp - line)) >= + sizeof(line) - (lp - line)) + printf("\tpath too long, %s/%s", SD, cp); + else + unlinkf(line); } } while (++i < nitems); } |