Module Name: src
Committed By: christos
Date: Sat Dec 24 23:29:32 UTC 2011
Modified Files:
src/usr.sbin/catman: catman.c
Log Message:
PR/45660: Henning Petersen: Overlapping buffer in catman.c.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/catman/catman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/catman/catman.c
diff -u src/usr.sbin/catman/catman.c:1.30 src/usr.sbin/catman/catman.c:1.31
--- src/usr.sbin/catman/catman.c:1.30 Mon Aug 29 16:38:55 2011
+++ src/usr.sbin/catman/catman.c Sat Dec 24 18:29:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: catman.c,v 1.30 2011/08/29 20:38:55 joerg Exp $ */
+/* $NetBSD: catman.c,v 1.31 2011/12/24 23:29:32 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -557,18 +557,23 @@ setcatsuffix(char *catpage, const char *
static void
makecat(const char *manpage, const char *catpage, const char *buildcmd,
- const char *crunchcmd)
+ const char *crunchcmd)
{
char crunchbuf[1024];
char sysbuf[2048];
+ int len;
- snprintf(sysbuf, sizeof(sysbuf), buildcmd, manpage);
+ len = snprintf(sysbuf, sizeof(sysbuf), buildcmd, manpage);
+ if (len < 0)
+ err(1, "snprintf");
if (*crunchcmd != '\0') {
snprintf(crunchbuf, sizeof(crunchbuf), crunchcmd, catpage);
- snprintf(sysbuf, sizeof(sysbuf), "%s | %s", sysbuf, crunchbuf);
+ snprintf(sysbuf + len, sizeof(sysbuf) - len, "%s | %s", sysbuf,
+ crunchbuf);
} else {
- snprintf(sysbuf, sizeof(sysbuf), "%s > %s", sysbuf, catpage);
+ snprintf(sysbuf + len, sizeof(sysbuf) - len, "%s > %s", sysbuf,
+ catpage);
}
if (f_noprint == 0)
