52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
commit 927dfcf693165f5b08efba0d031d4cc43e6f9c37
|
|
Author: Daniel P. Berrange <berrange@redhat.com>
|
|
Date: Fri Jul 8 12:35:36 2011 +0100
|
|
|
|
Fix leak of 'msg' object in client stream code
|
|
|
|
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
|
|
|
|
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
|
|
index 8414ad8..c39520a 100644
|
|
--- a/src/rpc/virnetclientprogram.c
|
|
+++ b/src/rpc/virnetclientprogram.c
|
|
@@ -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;
|
|
}
|
|
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
|
|
index d5efab1..fe15acd 100644
|
|
--- a/src/rpc/virnetclientstream.c
|
|
+++ b/src/rpc/virnetclientstream.c
|
|
@@ -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;
|
|
}
|
|
|