src/openvz_driver.c: Fix segfault in OpenVZ driver

(Evgeniy Sokolov).

diff --git a/ChangeLog b/ChangeLog
index fd319089af9d13b5ce24f304df2b7299618929fb..5ac49101e72e540c346d8b96b0f88a44afc80683 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 17 17:02:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/openvz_driver.c: Fix segfault in OpenVZ driver
+         (Evgeniy Sokolov).
+
 Wed Sep 17 16:38:00 BST 2008 Daniel P berrange <berrange@redhat.com>
 
        * tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml,

diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index bd4f965d935d80b4923bf239abe1ce5d9a10ee42..f68841ee1660911e6210244ec53b9d9fe2aacf71 100644 (file)
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -436,9 +436,10 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
 
     vm = virDomainFindByName(driver->domains, vmdef->name);
     if (vm) {
-        virDomainDefFree(vmdef);
-        openvzLog(OPENVZ_ERR, _("Already an OPENVZ VM active with the id '%s'"),
+        openvzError(conn, VIR_ERR_OPERATION_FAILED,
+                  _("Already an OPENVZ VM active with the id '%s'"),
                   vmdef->name);
+        virDomainDefFree(vmdef);
         return NULL;
     }
     if (!(vm = virDomainAssignDef(conn, &driver->domains, vmdef))) {
@@ -512,10 +513,10 @@ openvzDomainCreateLinux(virConnectPtr conn, const char *xml,
 
     vm = virDomainFindByName(driver->domains, vmdef->name);
     if (vm) {
+        openvzError(conn, VIR_ERR_OPERATION_FAILED,
+                  _("Already an OPENVZ VM defined with the id '%s'"),
+                  vmdef->name);
         virDomainDefFree(vmdef);
-        openvzLog(OPENVZ_ERR,
-                  _("Already an OPENVZ VM defined with the id '%d'"),
-                strtoI(vmdef->name));
         return NULL;
     }
     if (!(vm = virDomainAssignDef(conn, &driver->domains, vmdef))) {