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

cpu_x86: Don't ignore parsing errors in x86VendorLoad

Browse Source 
CPU map XML is our internal data file, it makes no sense to tolerate any
errors in it.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-05-12 15:29:49 +02:00
parent 945776dbc6
commit db8a1873fb
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cpu/cpu_x86.c
View File

@ -527,22 +527,22 @@ x86VendorLoad(xmlXPathContextPtr ctxt,
{
virCPUx86VendorPtr vendor = NULL;
char *string = NULL;
int ret = 0;
int ret = -1;
if (VIR_ALLOC(vendor) < 0)
goto error;
goto cleanup;
vendor->name = virXPathString("string(@name)", ctxt);
if (!vendor->name) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing CPU vendor name"));
goto ignore;
goto cleanup;
}
if (x86VendorFind(map, vendor->name)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("CPU vendor %s already defined"), vendor->name);
goto ignore;
goto cleanup;
}
string = virXPathString("string(@string)", ctxt);
@ -550,12 +550,12 @@ x86VendorLoad(xmlXPathContextPtr ctxt,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Missing vendor string for CPU vendor %s"),
vendor->name);
goto ignore;
goto cleanup;
}
if (strlen(string) != VENDOR_STRING_LENGTH) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid CPU vendor string '%s'"), string);
goto ignore;
goto cleanup;
}
vendor->cpuid.function = 0;
@ -565,17 +565,14 @@ x86VendorLoad(xmlXPathContextPtr ctxt,
vendor->next = map->vendors;
map->vendors = vendor;
vendor = NULL;
ret = 0;
cleanup:
VIR_FREE(string);
return ret;
error:
ret = -1;
ignore:
x86VendorFree(vendor);
goto cleanup;
return ret;
}