diff options
| author | Jamie Gritton <jamie@FreeBSD.org> | 2010-07-15 19:21:33 +0000 |
|---|---|---|
| committer | Jamie Gritton <jamie@FreeBSD.org> | 2010-07-15 19:21:33 +0000 |
| commit | fba36ac4de82159574480d5dae5756a62f86c17c (patch) | |
| tree | f8d52a7e2207968fb3c399e6c25ddda89aa8f4e2 /lib | |
| parent | c26c472cc885a94e8c52e6fc61bfbdd3488592e5 (diff) | |
| download | src-fba36ac4de82159574480d5dae5756a62f86c17c.tar.gz src-fba36ac4de82159574480d5dae5756a62f86c17c.zip | |
Don't copy and return a potentially unset buffer when jail_get fails.
Notes
Notes:
svn path=/head/; revision=210134
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libjail/jail_getid.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/libjail/jail_getid.c b/lib/libjail/jail_getid.c index e7601d51b8ba..fa1042407e69 100644 --- a/lib/libjail/jail_getid.c +++ b/lib/libjail/jail_getid.c @@ -94,11 +94,15 @@ jail_getname(int jid) jiov[5].iov_len = JAIL_ERRMSGLEN; jail_errmsg[0] = 0; jid = jail_get(jiov, 6, 0); - if (jid < 0 && !jail_errmsg[0]) - snprintf(jail_errmsg, JAIL_ERRMSGLEN, "jail_get: %s", - strerror(errno)); - name = strdup(namebuf); - if (name == NULL) - strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN); + if (jid < 0) { + if (!jail_errmsg[0]) + snprintf(jail_errmsg, JAIL_ERRMSGLEN, "jail_get: %s", + strerror(errno)); + return NULL; + } else { + name = strdup(namebuf); + if (name == NULL) + strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN); + } return name; } |