From owner-svn-src-all@FreeBSD.ORG  Tue Oct  5 15:27:45 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67D84106566B;
	Tue,  5 Oct 2010 15:27:45 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C5048FC26;
	Tue,  5 Oct 2010 15:27:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o95FRjA5060835;
	Tue, 5 Oct 2010 15:27:45 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o95FRjAN060833;
	Tue, 5 Oct 2010 15:27:45 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201010051527.o95FRjAN060833@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 5 Oct 2010 15:27:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213451 - head/lib/libgeom
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Oct 2010 15:27:45 -0000

Author: emaste
Date: Tue Oct  5 15:27:44 2010
New Revision: 213451
URL: http://svn.freebsd.org/changeset/base/213451

Log:
  Handle null return from XML_ParserCreate and fix a few memory leaks on
  error conditions.
  
  Submitted by:	Mark Johnston <mjohnston at sandvine dot com>
  MFC after:	2 weeks

Modified:
  head/lib/libgeom/geom_xml2tree.c

Modified: head/lib/libgeom/geom_xml2tree.c
==============================================================================
--- head/lib/libgeom/geom_xml2tree.c	Tue Oct  5 09:20:46 2010	(r213450)
+++ head/lib/libgeom/geom_xml2tree.c	Tue Oct  5 15:27:44 2010	(r213451)
@@ -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) {