Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up seriously borked mallocing of a static buffer, which seems to 

have been this way since at least 4.4. This will still dump core if
malloc fails on the first trip through, instead of on any malloc
failure, but should otherwise behave much more reasonably.
This commit is contained in:
dholland 2009-08-31 07:11:16 +00:00
parent da5f74ac6d
commit 83b3dbf601
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/rcp/rcp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rcp.c,v 1.47 2008/07/20 00:52:40 lukem Exp $ */ /* $NetBSD: rcp.c,v 1.48 2009/08/31 07:11:16 dholland Exp $ */
/* /*
* Copyright (c) 1983, 1990, 1992, 1993 * Copyright (c) 1983, 1990, 1992, 1993
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1990, 1992, 1993\
#if 0 #if 0
static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#else #else
__RCSID("$NetBSD: rcp.c,v 1.47 2008/07/20 00:52:40 lukem Exp $"); __RCSID("$NetBSD: rcp.c,v 1.48 2009/08/31 07:11:16 dholland Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -583,15 +583,22 @@ sink(int argc, char *argv[])
SCREWUP("size not delimited"); SCREWUP("size not delimited");
if (targisdir) { if (targisdir) {
static char *namebuf; static char *namebuf;
static int cursize; static size_t cursize;
char *newnamebuf;
size_t need; size_t need;
need = strlen(targ) + strlen(cp) + 250; need = strlen(targ) + strlen(cp) + 250;
if (need > cursize) { if (need > cursize) {
if (!(namebuf = malloc(need))) newnamebuf = realloc(namebuf, need);
if (newnamebuf != NULL) {
namebuf = newnamebuf;
cursize = need;
} else {
/* note: run_err is not fatal */
run_err("%s", strerror(errno)); run_err("%s", strerror(errno));
}
} }
(void)snprintf(namebuf, need, "%s%s%s", targ, (void)snprintf(namebuf, cursize, "%s%s%s", targ,
*targ ? "/" : "", cp); *targ ? "/" : "", cp);
np = namebuf; np = namebuf;
} else } else