]> xenbits.xensource.com Git - libvirt.git/commitdiff
xend_internal.c: don't dereference NULL for unexpected input
authorJim Meyering <meyering@redhat.com>
Fri, 19 Feb 2010 16:45:41 +0000 (17:45 +0100)
committerJim Meyering <meyering@redhat.com>
Fri, 19 Feb 2010 17:32:23 +0000 (18:32 +0100)
* src/xen/xend_internal.c (xenDaemonDomainSetAutostart): Avoid a NULL
dereference upon non-SEXPR_VALUE'd on_xend_start.  This bug was
introduced by commit 37ce5600c0bb1aed9e2f2888922388de4340ebd3.

src/xen/xend_internal.c

index 1f8b1065b45d99bb8c3ae00824cb8e25146bdddd..9d952914b60133766638594e43033dc101c98152 100644 (file)
@@ -4411,7 +4411,7 @@ xenDaemonDomainSetAutostart(virDomainPtr domain,
     if (autonode) {
         const char *val = (autonode->u.s.car->kind == SEXPR_VALUE
                            ? autonode->u.s.car->u.value : NULL);
-        if (!STREQ(val, "ignore") && !STREQ(val, "start")) {
+        if (!val || (!STREQ(val, "ignore") && !STREQ(val, "start"))) {
             virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
                          "%s", _("unexpected value from on_xend_start"));
             goto error;