Fix double-free in OpenVZ driver.

        * src/openvz_conf.c: Double-free fix (Anton Protopopov).

diff --git a/ChangeLog b/ChangeLog
index b266330457b9b6c3628633004cf45162fe2accb9..84d3e9d91cc1a2e37160d14424b5e03d59889616 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 21 15:17:00 UTC 2008 Richard W.M. Jones <rjones@redhat.com>
+
+       Fix double-free in OpenVZ driver.
+       * src/openvz_conf.c: Double-free fix (Anton Protopopov).
+
 Wed Feb 20 22:48:27 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/libvirt_sym.version: Added missing virStorageVolGetConnect

diff --git a/src/openvz_conf.c b/src/openvz_conf.c
index 482de823a1e901e7e5b52adbe4442ae5e439e6f2..0bc7084b901258e53debdf4bf5d3c88272564c97 100644 (file)
--- a/src/openvz_conf.c
+++ b/src/openvz_conf.c
@@ -536,7 +536,6 @@ openvzGetVPSInfo(virConnectPtr conn) {
         if (fscanf(fp, "%d %s\n", &veid, status) != 2) {
            error(conn, VIR_ERR_INTERNAL_ERROR,
                  "Failed to parse vzlist output");
-            free(*pnext);
            goto error;
        }
         if(strcmp(status, "stopped")) {
@@ -557,7 +556,6 @@ openvzGetVPSInfo(virConnectPtr conn) {
         vmdef = calloc(1, sizeof(*vmdef));
         if(!vmdef) {
             error(conn, VIR_ERR_INTERNAL_ERROR, "calloc failed");
-            free(*pnext);
            goto error;
         }
 
@@ -568,7 +566,6 @@ openvzGetVPSInfo(virConnectPtr conn) {
         if(ret == -1) {
             error(conn, VIR_ERR_INTERNAL_ERROR,
                  "UUID in config file malformed");
-            free(*pnext);
            free(vmdef);
             goto error;
         }