External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Plug memory leak on virNetClientSendInternal() error path

Browse Source 
Detected by Coverity. Leak introduced in commit 673adba.

Two separate bugs here:
1. call was not freed on all error paths
2. virCondDestroy was called even if virCondInit failed

Signed-off-by: Alex Jia <ajia@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Alex Jia 2011-11-30 13:57:09 +08:00 committed by Eric Blake
parent ad8fa356a6
commit 773a4ea5e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rpc/virnetclient.c
View File

@ -1708,7 +1708,7 @@ static int virNetClientSendInternal(virNetClientPtr client,
if (!client->sock || client->wantClose) {
virNetError(VIR_ERR_INTERNAL_ERROR, "%s",
_("client socket is closed"));
goto unlock;
goto cleanup;
}
if (virCondInit(&call->cond) < 0) {
@ -1729,16 +1729,16 @@ static int virNetClientSendInternal(virNetClientPtr client,
ret = virNetClientIO(client, call);
cleanup:
/* If partially sent, then the call is still on the dispatch queue */
if (ret == 1) {
call->haveThread = false;
} else {
ignore_value(virCondDestroy(&call->cond));
VIR_FREE(call);
}
unlock:
cleanup:
if (ret != 1)
VIR_FREE(call);
virNetClientUnlock(client);
return ret;
}