robustify sexpr parser for NICs

diff --git a/ChangeLog b/ChangeLog
index 3f7fdecd92ea0bd9815006417564b0416101bdcf..9d26ca7c575ce23410021ab9e61dcf03f2f3a5c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb  5 16:53:37 GMT 2009 John Levon <john.levon@sun.com>
+
+       * src/xend_internal.c: robustify sexpr parser for NICs
+
 Thu Feb 5 17:03:35 +0100 2009 Jim Meyering <meyering@redhat.com>
 
        syntax-check: enable prohibit_nonreentrant

diff --git a/src/xend_internal.c b/src/xend_internal.c
index aca22d25a641921edc03eee29cf133b31ae93057..3229674f064a9e9255a409d4543ac1360933af3d 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1759,7 +1759,8 @@ xenDaemonParseSxprNets(virConnectPtr conn,
             if (VIR_ALLOC(net) < 0)
                 goto no_memory;
 
-            if (tmp != NULL || (STREQ(tmp2, DEFAULT_VIF_SCRIPT))) {
+            if (tmp != NULL ||
+                (tmp2 != NULL && STREQ(tmp2, DEFAULT_VIF_SCRIPT))) {
                 net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
                 /* XXX virtual network reverse resolve */