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

Don't over-allocate array values in jailparam_export.

Browse Source 
Fix a little comment typo.

MFC after:	3 days
This commit is contained in:
Jamie Gritton 2010-08-31 21:50:09 +00:00
parent fa04d5d393
commit 4d02a3e762
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libjail/jail.c
View File

@ -719,6 +719,7 @@ jailparam_get(struct jailparam *jp, unsigned njp, int flags)
char *
jailparam_export(struct jailparam *jp)
{
size_t *valuelens;
char *value, *tvalue, **values;
size_t valuelen;
int i, nval, ival;
@ -740,6 +741,7 @@ jailparam_export(struct jailparam *jp)
return (value);
}
values = alloca(nval * sizeof(char *));
valuelens = alloca(nval * sizeof(size_t));
valuelen = 0;
for (i = 0; i < nval; i++) {
switch (jp->jp_ctltype & CTLTYPE) {
@ -809,11 +811,12 @@ jailparam_export(struct jailparam *jp)
errno = ENOENT;
return (NULL);
}
valuelen += strlen(valbuf) + 1;
values[i] = alloca(valuelen);
valuelens[i] = strlen(valbuf) + 1;
valuelen += valuelens[i];
values[i] = alloca(valuelens[i]);
strcpy(values[i], valbuf);
}
value = malloc(valuelen + 1);
value = malloc(valuelen);
if (value == NULL)
strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN);
else {
@ -821,8 +824,8 @@ jailparam_export(struct jailparam *jp)
for (i = 0; i < nval; i++) {
strcpy(tvalue, values[i]);
if (i < nval - 1) {
tvalue += strlen(values[i]);
*tvalue++ = ',';
tvalue += valuelens[i];
tvalue[-1] = ',';
}
}
}
@ -830,7 +833,7 @@ jailparam_export(struct jailparam *jp)
}
/*
* Free the contents of a jail parameter list (but not thst list itself).
* Free the contents of a jail parameter list (but not the list itself).
*/
void
jailparam_free(struct jailparam *jp, unsigned njp)