d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle null return from XML_ParserCreate and fix a few memory leaks on

Browse Source 
error conditions.

Submitted by:	Mark Johnston <mjohnston at sandvine dot com>
MFC after:	2 weeks
This commit is contained in:
Ed Maste 2010-10-05 15:27:44 +00:00
parent 8cd156782f
commit 2cf6dafa3e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libgeom/geom_xml2tree.c
View File

@ -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);
mt = calloc(1, sizeof *mt);
if (mt == NULL)
if (parser == NULL)
return (ENOMEM);
mt = calloc(1, sizeof *mt);
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) {