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

vz: vzEatCookie: separate allocation

Browse Source 
Use g_new0 outside of the error condition.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Ján Tomko 2020-10-02 20:11:56 +02:00
parent 3ac9e0edf7
commit 6b675a4651
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vz/vz_driver.c
View File

@ -2807,9 +2807,9 @@ vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags)
if (flags & VZ_MIGRATION_COOKIE_SESSION_UUID) { if (flags & VZ_MIGRATION_COOKIE_SESSION_UUID) {
g_autofree char *tmp = NULL; g_autofree char *tmp = NULL;
mig->session_uuid = g_new0(unsigned char, VIR_UUID_BUFLEN);
if ((!(tmp = virXPathString("string(./session-uuid[1])", ctx)) if ((!(tmp = virXPathString("string(./session-uuid[1])", ctx))
|| (VIR_ALLOC_N(mig->session_uuid, VIR_UUID_BUFLEN) < 0)
|| (virUUIDParse(tmp, mig->session_uuid) < 0))) { || (virUUIDParse(tmp, mig->session_uuid) < 0))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing or malformed session-uuid element " _("missing or malformed session-uuid element "
@ -2820,9 +2820,9 @@ vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags)
if (flags & VZ_MIGRATION_COOKIE_DOMAIN_UUID) { if (flags & VZ_MIGRATION_COOKIE_DOMAIN_UUID) {
g_autofree char *tmp = NULL; g_autofree char *tmp = NULL;
mig->uuid = g_new0(unsigned char, VIR_UUID_BUFLEN);
if ((!(tmp = virXPathString("string(./uuid[1])", ctx)) if ((!(tmp = virXPathString("string(./uuid[1])", ctx))
|| (VIR_ALLOC_N(mig->uuid, VIR_UUID_BUFLEN) < 0)
|| (virUUIDParse(tmp, mig->uuid) < 0))) { || (virUUIDParse(tmp, mig->uuid) < 0))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing or malformed uuid element in migration data")); _("missing or malformed uuid element in migration data"));