From: Jim Meyering <meyering@redhat.com>
Date: Fri, 19 Feb 2010 16:45:41 +0000 (+0100)
Subject: xend_internal.c: don't dereference NULL for unexpected input
X-Git-Tag: v0.7.7~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ee6a66f892ebc88ed805a768bc0d8d5508b67d;p=thirdparty%2Flibvirt.git

xend_internal.c: don't dereference NULL for unexpected input

* 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.
---

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 1f8b1065b4..9d952914b6 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -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;