From owner-svn-src-all@FreeBSD.ORG  Sun Aug 16 21:32:12 2009
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 726EB106564A;
	Sun, 16 Aug 2009 21:32:12 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 60A3A8FC67;
	Sun, 16 Aug 2009 21:32:12 +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 n7GLWCbV032671;
	Sun, 16 Aug 2009 21:32:12 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7GLWCGm032669;
	Sun, 16 Aug 2009 21:32:12 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200908162132.n7GLWCGm032669@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 16 Aug 2009 21:32:12 +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: r196279 - in stable/8/sbin/geom: . class/part
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: Sun, 16 Aug 2009 21:32:12 -0000

Author: marcel
Date: Sun Aug 16 21:32:12 2009
New Revision: 196279
URL: http://svn.freebsd.org/changeset/base/196279

Log:
  MFC change 196278:
   Emit a proper error message instead of dumping core when 1)
   GEOM_PART does not exist in the kernel, and 2) the GEOM in
   question does not exist.
   Additionally abort in case of programming errors that result
   in neither the class nor geom not being present in the gctl
   request.
  
  Approved by:	re (kib)

Modified:
  stable/8/sbin/geom/   (props changed)
  stable/8/sbin/geom/class/part/geom_part.c

Modified: stable/8/sbin/geom/class/part/geom_part.c
==============================================================================
--- stable/8/sbin/geom/class/part/geom_part.c	Sun Aug 16 21:27:35 2009	(r196278)
+++ stable/8/sbin/geom/class/part/geom_part.c	Sun Aug 16 21:32:12 2009	(r196279)
@@ -274,8 +274,18 @@ gpart_autofill(struct gctl_req *req)
 	error = geom_gettree(&mesh);
 	if (error)
 		return (error);
-	cp = find_class(&mesh, gctl_get_ascii(req, "class"));
-	gp = find_geom(cp, gctl_get_ascii(req, "geom"));
+	s = gctl_get_ascii(req, "class");
+	if (s == NULL)
+		abort();
+	cp = find_class(&mesh, s);
+	if (cp == NULL)
+		errx(EXIT_FAILURE, "Class %s not found.", s);
+	s = gctl_get_ascii(req, "geom");
+	if (s == NULL)
+		abort();
+	gp = find_geom(cp, s);
+	if (gp == NULL)
+		errx(EXIT_FAILURE, "No such geom: %s.", s);
 	first = atoll(find_geomcfg(gp, "first"));
 	last = atoll(find_geomcfg(gp, "last"));
 	grade = ~0ULL;
@@ -536,6 +546,8 @@ gpart_write_partcode(struct gctl_req *re
 		errx(EXIT_FAILURE, "Class %s not found.", s);
 	}
 	s = gctl_get_ascii(req, "geom");
+	if (s == NULL)
+		abort();
 	gp = find_geom(classp, s);
 	if (gp == NULL)
 		errx(EXIT_FAILURE, "No such geom: %s.", s);