[libvirt] [PATCH] Robustify sexpr parser for NICs

[john.levon at sun.com]

# HG changeset patch
# User john.levon at sun.com
# Date 1233806614 28800
# Node ID 0b9d8336e5e089b19ac8381fdc77eadc72ef9eb7
# Parent  379763c63798c9f0c426facb9b9b61e34e6477e2
Robustify sexpr parser for NICs

xend can occassionally get itself confused. Avoid crashing libvirt in
this case.

Signed-off-by: John Levon <john.levon at sun.com>

diff --git a/src/xend_internal.c b/src/xend_internal.c
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1759,7 +1759,8 @@ xenDaemonParseSxprNets(virConnectPtr con
             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 */