External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-01 20:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't clobber 'ret' variable in testCompareXMLToXMLHelper

Browse Source 
The qemuxml2xmltest.c function testCompareXMLToXMLHelper would
clobber the 'ret' variable causing it to mis-diagnose OOM
errors.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-09-25 15:56:05 +01:00
parent 4b744d7d00
commit 50ee3e0357
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/qemuxml2xmltest.c
View File

@ -84,16 +84,19 @@ testCompareXMLToXMLHelper(const void *data)
abs_srcdir, info->name) < 0)
goto cleanup;
if (info->when & WHEN_INACTIVE) {
ret = testCompareXMLToXMLFiles(xml_in,
info->different ? xml_out : xml_in,
false);
}
if (info->when & WHEN_ACTIVE) {
ret = testCompareXMLToXMLFiles(xml_in,
info->different ? xml_out : xml_in,
true);
}
if ((info->when & WHEN_INACTIVE) &&
testCompareXMLToXMLFiles(xml_in,
info->different ? xml_out : xml_in,
false) < 0)
goto cleanup;
if ((info->when & WHEN_ACTIVE) &&
testCompareXMLToXMLFiles(xml_in,
info->different ? xml_out : xml_in,
true) < 0)
goto cleanup;
ret = 0;
cleanup:
VIR_FREE(xml_in);