External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: stronger error reporting when parsing audio related params

Browse Source 
Check for varuous mandatory elements and improve error message
clarity

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-02-23 18:54:53 +00:00
parent 759f81560c
commit d6b79a64e6
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/domain_conf.c
View File

@ -13804,6 +13804,11 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt,
if (audioNode) { if (audioNode) {
g_autofree char *tmp = NULL; g_autofree char *tmp = NULL;
tmp = virXMLPropString(audioNode, "id"); tmp = virXMLPropString(audioNode, "id");
if (!tmp) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing audio 'id' attribute"));
goto error;
}
if (virStrToLong_ui(tmp, NULL, 10, &def->audioId) < 0 || if (virStrToLong_ui(tmp, NULL, 10, &def->audioId) < 0 ||
def->audioId == 0) { def->audioId == 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
@ -13877,6 +13882,12 @@ virDomainAudioDefParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED,
ctxt->node = node; ctxt->node = node;
type = virXMLPropString(node, "type"); type = virXMLPropString(node, "type");
if (!type) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing audio 'type' attribute"));
goto error;
}
if ((def->type = virDomainAudioTypeTypeFromString(type)) < 0) { if ((def->type = virDomainAudioTypeTypeFromString(type)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown audio type '%s'"), type); _("unknown audio type '%s'"), type);
@ -13884,6 +13895,11 @@ virDomainAudioDefParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED,
} }
tmp = virXMLPropString(node, "id"); tmp = virXMLPropString(node, "id");
if (!tmp) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("missing audio 'id' attribute"));
goto error;
}
if (virStrToLong_ui(tmp, NULL, 10, &def->id) < 0 || if (virStrToLong_ui(tmp, NULL, 10, &def->id) < 0 ||
def->id == 0) { def->id == 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,