aboutsummaryrefslogtreecommitdiff
path: root/lib/libjail
diff options
context:
space:
mode:
authorJamie Gritton <jamie@FreeBSD.org>2009-12-17 05:06:56 +0000
committerJamie Gritton <jamie@FreeBSD.org>2009-12-17 05:06:56 +0000
commit1574e5ddd96a16db8dda11741c2c4b129cab7d4f (patch)
treec75a07f117d1296d5a886ecb12ecc30c63961a80 /lib/libjail
parente7d829a46cdcee3c6751a51933204f6f7b2116a9 (diff)
downloadsrc-1574e5ddd96a16db8dda11741c2c4b129cab7d4f.tar.gz
src-1574e5ddd96a16db8dda11741c2c4b129cab7d4f.zip
Add a null pointer check so "name" can be used as a key parameter in
jailparam_get. PR: bin/141692 Submitted by: delphij MFC after: 3 days
Notes
Notes: svn path=/head/; revision=200623
Diffstat (limited to 'lib/libjail')
-rw-r--r--lib/libjail/jail.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c
index 9411b88bdf6b..39c88d098edc 100644
--- a/lib/libjail/jail.c
+++ b/lib/libjail/jail.c
@@ -532,7 +532,7 @@ jailparam_get(struct jailparam *jp, unsigned njp, int flags)
}
jp_key = jp_lastjid ? jp_lastjid :
jp_jid && jp_jid->jp_valuelen == sizeof(int) &&
- *(int *)jp_jid->jp_value ? jp_jid : jp_name;
+ jp_jid->jp_value && *(int *)jp_jid->jp_value ? jp_jid : jp_name;
if (jp_key == NULL || jp_key->jp_value == NULL) {
strlcpy(jail_errmsg, "no jail specified", JAIL_ERRMSGLEN);
errno = ENOENT;