]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix leak of 'msg' object in client stream code
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 8 Jul 2011 11:35:36 +0000 (12:35 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 8 Jul 2011 15:19:57 +0000 (16:19 +0100)
In one exit path we forgot to free the virNetMessage object causing
a large memory leak for streams which send a lot of data. Some other
paths were calling VIR_FREE directly instead of virNetMessageFree
although this was (currently) harmless.

* src/rpc/virnetclientstream.c: Fix leak of msg object
* src/rpc/virnetclientprogram.c: Call virNetMessageFree instead
  of VIR_FREE

src/rpc/virnetclientprogram.c
src/rpc/virnetclientstream.c

index 8414ad86e02a6ee824eb50be57259a7157c01710..c39520abfd831fe83b80db487bec5ee4db7fed9d 100644 (file)
@@ -329,11 +329,11 @@ int virNetClientProgramCall(virNetClientProgramPtr prog,
         goto error;
     }
 
-    VIR_FREE(msg);
+    virNetMessageFree(msg);
 
     return 0;
 
 error:
-    VIR_FREE(msg);
+    virNetMessageFree(msg);
     return -1;
 }
index d5efab12e5125e2660e9cf091d4c84751b050f67..fe15acdf614da936c2405bc3451abbe0b9173ff4 100644 (file)
@@ -361,11 +361,12 @@ int virNetClientStreamSendPacket(virNetClientStreamPtr st,
     if (virNetClientSend(client, msg, wantReply) < 0)
         goto error;
 
+    virNetMessageFree(msg);
 
     return nbytes;
 
 error:
-    VIR_FREE(msg);
+    virNetMessageFree(msg);
     return -1;
 }