From owner-svn-src-stable-9@FreeBSD.ORG  Sat May 25 09:47:33 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CC67C151;
 Sat, 25 May 2013 09:47:33 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BD576919;
 Sat, 25 May 2013 09:47:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4P9lXwJ054882;
 Sat, 25 May 2013 09:47:33 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4P9lX4m054881;
 Sat, 25 May 2013 09:47:33 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201305250947.r4P9lX4m054881@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Sat, 25 May 2013 09:47:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r250976 - stable/9/usr.sbin/ctladm
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 May 2013 09:47:33 -0000

Author: jh
Date: Sat May 25 09:47:33 2013
New Revision: 250976
URL: http://svnweb.freebsd.org/changeset/base/250976

Log:
  MFC r250443: Check the return value of sbuf_finish().

Modified:
  stable/9/usr.sbin/ctladm/ctladm.c
Directory Properties:
  stable/9/usr.sbin/ctladm/   (props changed)

Modified: stable/9/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/9/usr.sbin/ctladm/ctladm.c	Sat May 25 07:17:16 2013	(r250975)
+++ stable/9/usr.sbin/ctladm/ctladm.c	Sat May 25 09:47:33 2013	(r250976)
@@ -545,7 +545,8 @@ retry:
 	}
 	if (xml != 0) {
 		sbuf_printf(sb, "</ctlfelist>\n");
-		sbuf_finish(sb);
+		if (sbuf_finish(sb) != 0)
+			err(1, "%s: sbuf_finish", __func__);
 		printf("%s", sbuf_data(sb));
 		sbuf_delete(sb);
 	}
@@ -3492,7 +3493,8 @@ cctl_end_element(void *user_data, const 
 		errx(1, "%s: no valid sbuf at level %d (name %s)", __func__,
 		     devlist->level, name);
 
-	sbuf_finish(devlist->cur_sb[devlist->level]);
+	if (sbuf_finish(devlist->cur_sb[devlist->level]) != 0)
+		err(1, "%s: sbuf_finish", __func__);
 	str = strdup(sbuf_data(devlist->cur_sb[devlist->level]));
 	if (str == NULL)
 		err(1, "%s can't allocate %zd bytes for string", __func__,