emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/env.c: Added assertions on the snprintf results.

Browse Source
This commit is contained in:
nekral-guest 2009-04-27 20:07:59 +00:00
parent 80fd2969c9
commit 988f7334ad
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2009-04-27 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/env.c: Added assertions on the snprintf results.
2009-04-27 Nicolas François <nicolas.francois@centraliens.net> 2009-04-27 Nicolas François <nicolas.francois@centraliens.net>
* NEWS, configure.in: Added configure option --enable-utmpx, * NEWS, configure.in: Added configure option --enable-utmpx,

13
libmisc/env.c
View File

@ -34,6 +34,7 @@
#ident "$Id$" #ident "$Id$"
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -92,8 +93,11 @@ void addenv (const char *string, /*@null@*/const char *value)
size_t n; size_t n;
if (NULL != value) { if (NULL != value) {
newstring = xmalloc (strlen (string) + strlen (value) + 2); size_t len = strlen (string) + strlen (value) + 2;
sprintf (newstring, "%s=%s", string, value); int wlen;
newstring = xmalloc (len);
wlen = snprintf (newstring, len, "%s=%s", string, value);
assert (wlen == (int) len -1);
} else { } else {
newstring = xstrdup (string); newstring = xstrdup (string);
} }
@ -187,7 +191,10 @@ void set_env (int argc, char *const *argv)
cp = strchr (*argv, '='); cp = strchr (*argv, '=');
if (NULL == cp) { if (NULL == cp) {
snprintf (variable, sizeof variable, "L%d", noname++); int wlen;
wlen = snprintf (variable, sizeof variable, "L%d", noname);
assert (wlen < (int) sizeof(variable));
noname++;
addenv (variable, *argv); addenv (variable, *argv);
} else { } else {
const char **p; const char **p;