From bc68ae80608f6a1be4fc0e5965377b973c94f65d Mon Sep 17 00:00:00 2001
From: John Levon <john.levon@sun.com>
Date: Thu, 5 Feb 2009 17:17:33 +0000
Subject: [PATCH] robustify sexpr parser for NICs

---
 ChangeLog           | 4 ++++
 src/xend_internal.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3f7fdecd92..9d26ca7c57 100644
--- 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 aca22d25a6..3229674f06 100644
--- 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 */