* src/xen_unified.c: fix a leak in xenUnifiedOpen

Daniel

diff --git a/ChangeLog b/ChangeLog
index f98ff74c1845e762d9a01921b9ef76e31238ddde..d49218b5c5e0c6fe668c61f6f0a359e8781e63c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 21 11:47:08 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+       * src/xen_unified.c: fix a leak in xenUnifiedOpen
+
 Mon Jul 21 10:07:08 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        * src/openvz_driver.c: patch from Evgeniy Sokolov to get OpenVZ

diff --git a/src/xen_unified.c b/src/xen_unified.c
index 73c335eaf2b001bf66066979a89e9bd350dbd9e0..5527c41fbff4d0723b9c3c848c1ff9d232c82aee 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -239,7 +239,7 @@ xenUnifiedProbe (void)
 static int
 xenUnifiedOpen (virConnectPtr conn, xmlURIPtr uri, virConnectAuthPtr auth, int flags)
 {
-    int i;
+    int i, ret = VIR_DRV_OPEN_DECLINED;
     xenUnifiedPrivatePtr priv;
 
     /* Refuse any scheme which isn't "xen://" or "http://". */
@@ -329,19 +329,22 @@ xenUnifiedOpen (virConnectPtr conn, xmlURIPtr uri, virConnectAuthPtr auth, int f
             }
 #else
             DEBUG0("Handing off for remote driver");
-            return VIR_DRV_OPEN_DECLINED; /* Let remote_driver try instead */
+            ret = VIR_DRV_OPEN_DECLINED; /* Let remote_driver try instead */
+            goto clean;
 #endif
         }
     }
 
     return VIR_DRV_OPEN_SUCCESS;
 
- fail:
+fail:
+    ret = VIR_DRV_OPEN_ERROR;
+clean:
     DEBUG0("Failed to activate a mandatory sub-driver");
     for (i = 0 ; i < XEN_UNIFIED_NR_DRIVERS ; i++)
         if (priv->opened[i]) drivers[i]->close(conn);
     VIR_FREE(priv);
-    return VIR_DRV_OPEN_ERROR;
+    return ret
 }
 
 #define GET_PRIVATE(conn) \