Author: emaste
Date: Tue Oct 19 13:06:26 2010
New Revision: 214055
URL: http://svn.freebsd.org/changeset/base/214055
Log:
MFC r213451:
Handle null return from XML_ParserCreate and fix a few memory leaks on
error conditions.
Modified:
stable/8/lib/libgeom/geom_xml2tree.c
Directory Properties:
stable/8/lib/libgeom/ (props changed)
Modified: stable/8/lib/libgeom/geom_xml2tree.c
==============================================================================
--- stable/8/lib/libgeom/geom_xml2tree.c Tue Oct 19 12:35:40 2010
(r214054)
+++ stable/8/lib/libgeom/geom_xml2tree.c Tue Oct 19 13:06:26 2010
(r214055)
@@ -339,21 +339,27 @@ geom_xml2tree(struct gmesh *gmp, char *p
memset(gmp, 0, sizeof *gmp);
LIST_INIT(&gmp->lg_class);
parser = XML_ParserCreate(NULL);
+ if (parser == NULL)
+ return (ENOMEM);
mt = calloc(1, sizeof *mt);
- if (mt == NULL)
+ if (mt == NULL) {
+ XML_ParserFree(parser);
return (ENOMEM);
+ }
mt->mesh = gmp;
XML_SetUserData(parser, mt);
XML_SetElementHandler(parser, StartElement, EndElement);
XML_SetCharacterDataHandler(parser, CharData);
i = XML_Parse(parser, p, strlen(p), 1);
- if (i != 1)
- return (-1);
XML_ParserFree(parser);
+ if (i != 1) {
+ free(mt);
+ return (-1);
+ }
gmp->lg_ident = calloc(sizeof *gmp->lg_ident, mt->nident + 1);
+ free(mt);
if (gmp->lg_ident == NULL)
return (ENOMEM);
- free(mt);
i = 0;
/* Collect all identifiers */
LIST_FOREACH(cl, &gmp->lg_class, lg_class) {
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
