From be8653b183b05da89f6848a6cca386f43c201eac Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 21 Feb 2008 15:20:36 +0000
Subject: [PATCH] Fix double-free in OpenVZ driver.         *
 src/openvz_conf.c: Double-free fix (Anton Protopopov).

---
 ChangeLog         | 5 +++++
 src/openvz_conf.c | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b266330457..84d3e9d91c 100644
--- 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 482de823a1..0bc7084b90 100644
--- 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;
         }