From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 19 13:06:26 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7FD021065670;
	Tue, 19 Oct 2010 13:06:26 +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 6DA148FC15;
	Tue, 19 Oct 2010 13:06:26 +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 o9JD6QVY015527;
	Tue, 19 Oct 2010 13:06:26 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9JD6Q5O015525;
	Tue, 19 Oct 2010 13:06:26 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201010191306.o9JD6Q5O015525@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 19 Oct 2010 13:06:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214055 - stable/8/lib/libgeom
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Oct 2010 13:06:26 -0000

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) {