[libvirt] [PATCH] Fix leak of JSON object for events

30 Jun 2011

The event handler functions do not free the virJSONValuePtr
object. Every event received from a VM thus caused a memory
leak

* src/qemu/qemu_monitor_json.c: Fix leak of event object
---
 src/qemu/qemu_monitor_json.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 7d286d8..81b7f8c 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -122,7 +122,6 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon,
 
     if (virJSONValueObjectHasKey(obj, "QMP") == 1) {
         ret = 0;
-        virJSONValueFree(obj);
     } else if (virJSONValueObjectHasKey(obj, "event") == 1) {
         ret = qemuMonitorJSONIOProcessEvent(mon, obj);
     } else if (virJSONValueObjectHasKey(obj, "error") == 1 ||
@@ -130,6 +129,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon,
         if (msg) {
             msg->rxObject = obj;
             msg->finished = 1;
+            obj = NULL;
             ret = 0;
         } else {
             qemuReportError(VIR_ERR_INTERNAL_ERROR,
@@ -141,8 +141,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon,
     }
 
 cleanup:
-    if (ret < 0)
-        virJSONValueFree(obj);
+    virJSONValueFree(obj);
     return ret;
 }
 
-- 
1.7.4.4

    

Daniel P. Berrange

Eric Blake

tags

participants (2)