svn commit: r200623 - head/lib/libjail

[Jamie Gritton]

Author: jamie
Date: Thu Dec 17 05:06:56 2009
New Revision: 200623
URL: http://svn.freebsd.org/changeset/base/200623

Log:
  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

Modified:
  head/lib/libjail/jail.c

Modified: head/lib/libjail/jail.c
==============================================================================
--- head/lib/libjail/jail.c	Thu Dec 17 02:06:07 2009	(r200622)
+++ head/lib/libjail/jail.c	Thu Dec 17 05:06:56 2009	(r200623)
@@ -532,7 +532,7 @@ jailparam_get(struct jailparam *jp, unsi
 	}
 	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;