NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Avoid resetting errors before they are reported

Browse Source 
Commit f44bfb7 was supposed to make sure no additional libvirt API (esp.
*Free) is called before remoteDispatchConnError() is called on error.
However, the patch missed two instances.
This commit is contained in:
Jiri Denemark 2011-03-25 12:03:00 +01:00
parent 9ed545185f
commit 55cc591fc1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/remote.c
View File

@ -5108,12 +5108,13 @@ remoteDispatchStoragePoolListVolumes (struct qemud_server *server ATTRIBUTE_UNUS
ret->names.names_len = ret->names.names_len =
virStoragePoolListVolumes (pool, virStoragePoolListVolumes (pool,
ret->names.names_val, args->maxnames); ret->names.names_val, args->maxnames);
virStoragePoolFree(pool);
if (ret->names.names_len == -1) { if (ret->names.names_len == -1) {
VIR_FREE(ret->names.names_val); VIR_FREE(ret->names.names_val);
remoteDispatchConnError(rerr, conn); remoteDispatchConnError(rerr, conn);
virStoragePoolFree(pool);
return -1; return -1;
} }
virStoragePoolFree(pool);
return 0; return 0;
} }
@ -5137,11 +5138,12 @@ remoteDispatchStoragePoolNumOfVolumes (struct qemud_server *server ATTRIBUTE_UNU
} }
ret->num = virStoragePoolNumOfVolumes (pool); ret->num = virStoragePoolNumOfVolumes (pool);
virStoragePoolFree(pool);
if (ret->num == -1) { if (ret->num == -1) {
remoteDispatchConnError(rerr, conn); remoteDispatchConnError(rerr, conn);
virStoragePoolFree(pool);
return -1; return -1;
} }
virStoragePoolFree(pool);
return 0; return 0;
} }