d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent potential argument buffer overflow.

Browse Source
This commit is contained in:
jkh 1997-02-15 16:34:47 +00:00
parent 425611c5c7
commit 7e5fec3559
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.sbin/pkg_install/add/extract.c
View File

@ -56,10 +56,10 @@ extract_plist(char *home, Package *pkg)
maxargs = sysconf(_SC_ARG_MAX);
maxargs -= 64; /* some slop for the tar cmd text,
and sh -c */
where_args = malloc(maxargs);
where_args = alloca(maxargs);
if (!where_args)
barf("can't get argument list space");
perm_args = malloc(maxargs);
perm_args = alloca(maxargs);
if (!perm_args)
barf("can't get argument list space");
@ -99,19 +99,18 @@ extract_plist(char *home, Package *pkg)
if (rename(p->name, try) == 0) {
/* try to add to list of perms to be changed,
and run in bulk. */
if (p->name[0] == '/' || TOOBIG(p->name))
PUSHOUT(Directory);
add_count = snprintf(&perm_args[perm_count],
maxargs - perm_count,
"%s ", p->name);
if (add_count > maxargs - perm_count)
barf("oops, miscounted strings!");
perm_count += add_count;
if (p->name[0] == '/') {
PUSHOUT(Directory);
}
} else {
}
else {
/* rename failed, try copying with a big tar command */
if (p->name[0] == '/' ||
TOOBIG(p->name) ||
if (p->name[0] == '/' || TOOBIG(p->name) ||
last_chdir != Directory) {
PUSHOUT(last_chdir);
last_chdir = Directory;