From 52037657dc5f24db10ae5424df08363706f6d44d Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 11 Dec 2008 14:57:45 +0000
Subject: [PATCH] Fix segfault if virtual network does not have a bridge name

---
 ChangeLog            | 5 +++++
 src/network_driver.c | 7 +++++++
 src/qemu_conf.c      | 3 ---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 000b66d056..5d39d14499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 11 09:55:23 EST 2008 Cole Robinson <crobinso@redhat.com>
+
+	* src/netork_driver.c src/qemu_conf.c: Fix segfault if virtual
+	network does not have a bridge name.
+
 Thu Dec 11 12:39:20 CET 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/domain_conf.c src/domain_conf.h src/qemu_conf.c
diff --git a/src/network_driver.c b/src/network_driver.c
index f233dca902..0978341d09 100644
--- a/src/network_driver.c
+++ b/src/network_driver.c
@@ -1182,6 +1182,13 @@ static char *networkGetBridgeName(virNetworkPtr net) {
         goto cleanup;
     }
 
+    if (!(network->def->bridge)) {
+        networkReportError(net->conn, NULL, net, VIR_ERR_INTERNAL_ERROR,
+                           _("network '%s' does not have a bridge name."),
+                           network->def->name);
+        goto cleanup;
+    }
+
     bridge = strdup(network->def->bridge);
     if (!bridge)
         networkReportError(net->conn, NULL, net, VIR_ERR_NO_MEMORY,
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 3b846a3e19..8c24cea8c7 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -549,9 +549,6 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
         virNetworkFree(network);
 
         if (brname == NULL) {
-            qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                             _("Network '%s' is not active"),
-                             net->data.network.name);
             goto error;
         }
     } else if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) {