External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: Avoid leaking uri_out

Browse Source 
In case the API returned success and a NULL pointer in uri_out, we would
leak the preallocated buffer used for storing the uri_out pointer.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jiri Denemark 2023-01-25 15:06:33 +01:00
parent 4849eb2220
commit d0f339170f
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/remote/remote_daemon_dispatch.c
View File

@ -3062,15 +3062,14 @@ remoteDispatchDomainMigratePrepare2(virNetServer *server G_GNUC_UNUSED,
*/
ret->cookie.cookie_len = cookielen;
ret->cookie.cookie_val = cookie;
ret->uri_out = *uri_out == NULL ? NULL : uri_out;
ret->uri_out = *uri_out == NULL ? NULL : g_steal_pointer(&uri_out);
rv = 0;
cleanup:
if (rv < 0) {
if (rv < 0)
virNetMessageSaveError(rerr);
VIR_FREE(uri_out);
}
VIR_FREE(uri_out);
return rv;
}
@ -4777,15 +4776,14 @@ remoteDispatchDomainMigratePrepare3(virNetServer *server G_GNUC_UNUSED,
*/
ret->cookie_out.cookie_out_len = cookieoutlen;
ret->cookie_out.cookie_out_val = cookieout;
ret->uri_out = *uri_out == NULL ? NULL : uri_out;
ret->uri_out = *uri_out == NULL ? NULL : g_steal_pointer(&uri_out);
rv = 0;
cleanup:
if (rv < 0) {
if (rv < 0)
virNetMessageSaveError(rerr);
VIR_FREE(uri_out);
}
VIR_FREE(uri_out);
return rv;
}
@ -5573,16 +5571,15 @@ remoteDispatchDomainMigratePrepare3Params(virNetServer *server G_GNUC_UNUSED,
ret->cookie_out.cookie_out_len = cookieoutlen;
ret->cookie_out.cookie_out_val = cookieout;
ret->uri_out = !*uri_out ? NULL : uri_out;
ret->uri_out = !*uri_out ? NULL : g_steal_pointer(&uri_out);
rv = 0;
cleanup:
virTypedParamsFree(params, nparams);
if (rv < 0) {
if (rv < 0)
virNetMessageSaveError(rerr);
VIR_FREE(uri_out);
}
VIR_FREE(uri_out);
return rv;
}