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

Correct truncation detection after use of snprintf: The case where

Browse Source 
exactly one character was truncated was not detected.
This commit is contained in:
nectar 2003-12-17 13:36:05 +00:00
parent 8c6e6b677a
commit 1f8eedbe4a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ extract_plist(const char *home, Package *pkg)
PUSHOUT(Directory);
}
add_count = snprintf(&perm_args[perm_count], maxargs - perm_count, "'%s' ", p->name);
if (add_count < 0 || add_count > maxargs - perm_count) {
if (add_count < 0 || add_count >= maxargs - perm_count) {
cleanup(0);
errx(2, "%s: oops, miscounted strings!", __func__);
}
@ -179,7 +179,7 @@ extract_plist(const char *home, Package *pkg)
PUSHOUT(Directory);
}
add_count = snprintf(&where_args[where_count], maxargs - where_count, " '%s'", p->name);
if (add_count < 0 || add_count > maxargs - where_count) {
if (add_count < 0 || add_count >= maxargs - where_count) {
cleanup(0);
errx(2, "%s: oops, miscounted strings!", __func__);
}
@ -187,7 +187,7 @@ extract_plist(const char *home, Package *pkg)
add_count = snprintf(&perm_args[perm_count],
maxargs - perm_count,
"'%s' ", p->name);
if (add_count < 0 || add_count > maxargs - perm_count) {
if (add_count < 0 || add_count >= maxargs - perm_count) {
cleanup(0);
errx(2, "%s: oops, miscounted strings!", __func__);
}

4
usr.sbin/pkg_install/create/pl.c
View File

@ -204,7 +204,7 @@ copy_plist(const char *home, Package *plist)
p->name);
last_chdir = home;
}
if (add_count < 0 || add_count > maxargs - where_count) {
if (add_count < 0 || add_count >= maxargs - where_count) {
cleanup(0);
errx(2, "%s: oops, miscounted strings!", __func__);
}
@ -242,7 +242,7 @@ copy_plist(const char *home, Package *plist)
" -C %s %s",
mythere ? mythere : where,
p->name);
if (add_count < 0 || add_count > maxargs - where_count) {
if (add_count < 0 || add_count >= maxargs - where_count) {
cleanup(0);
errx(2, "%s: oops, miscounted strings!", __func__);
}