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

Don't copy and return a potentially unset buffer when jail_get fails.

Browse Source
This commit is contained in:
Jamie Gritton 2010-07-15 19:21:33 +00:00
parent c26c472cc8
commit fba36ac4de
1 changed files with 10 additions and 6 deletions

16
lib/libjail/jail_getid.c

@ -94,11 +94,15 @@ jail_getname(int jid)
jiov[5].iov_len = JAIL_ERRMSGLEN; jiov[5].iov_len = JAIL_ERRMSGLEN;
jail_errmsg[0] = 0; jail_errmsg[0] = 0;
jid = jail_get(jiov, 6, 0); jid = jail_get(jiov, 6, 0);
if (jid < 0 && !jail_errmsg[0]) if (jid < 0) {
snprintf(jail_errmsg, JAIL_ERRMSGLEN, "jail_get: %s", if (!jail_errmsg[0])
strerror(errno)); snprintf(jail_errmsg, JAIL_ERRMSGLEN, "jail_get: %s",
name = strdup(namebuf); strerror(errno));
if (name == NULL) return NULL;
strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN); } else {
name = strdup(namebuf);
if (name == NULL)
strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN);
}
return name; return name;
} }