External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: xml: Refactor cleanup path in virXMLValidatorInit

Browse Source 
Automatically free 'validator' on errors.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-08-04 10:31:06 +02:00
parent 21e67c667e
commit 3e10557766
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/virxml.c
View File

@ -1504,7 +1504,7 @@ virXMLValidatorRNGErrorIgnore(void *ctx G_GNUC_UNUSED,
virXMLValidator *
virXMLValidatorInit(const char *schemafile)
{
virXMLValidator *validator = NULL;
g_autoptr(virXMLValidator) validator = NULL;
validator = g_new0(virXMLValidator, 1);
@ -1515,7 +1515,7 @@ virXMLValidatorInit(const char *schemafile)
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to create RNG parser for %s"),
validator->schemafile);
goto error;
return NULL;
}
xmlRelaxNGSetParserErrors(validator->rngParser,
@ -1528,25 +1528,22 @@ virXMLValidatorInit(const char *schemafile)
_("Unable to parse RNG %s: %s"),
validator->schemafile,
virBufferCurrentContent(&validator->buf));
goto error;
return NULL;
}
if (!(validator->rngValid = xmlRelaxNGNewValidCtxt(validator->rng))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to create RNG validation context %s"),
validator->schemafile);
goto error;
return NULL;
}
xmlRelaxNGSetValidErrors(validator->rngValid,
virXMLValidatorRNGErrorCatch,
virXMLValidatorRNGErrorIgnore,
&validator->buf);
return validator;
error:
virXMLValidatorFree(validator);
return NULL;
return g_steal_pointer(&validator);
}