From owner-svn-src-all@FreeBSD.ORG  Fri May 10 09:58:33 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 11141950;
 Fri, 10 May 2013 09:58: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 036CAE33;
 Fri, 10 May 2013 09:58: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 r4A9wWGh011615;
 Fri, 10 May 2013 09:58:32 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4A9wWPd011614;
 Fri, 10 May 2013 09:58:32 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201305100958.r4A9wWPd011614@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Fri, 10 May 2013 09:58:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250443 - head/usr.sbin/ctladm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 10 May 2013 09:58:33 -0000

Author: jh
Date: Fri May 10 09:58:32 2013
New Revision: 250443
URL: http://svnweb.freebsd.org/changeset/base/250443

Log:
  Check the return value of sbuf_finish().
  
  MFC after:	1 week

Modified:
  head/usr.sbin/ctladm/ctladm.c

Modified: head/usr.sbin/ctladm/ctladm.c
==============================================================================
--- head/usr.sbin/ctladm/ctladm.c	Fri May 10 09:37:58 2013	(r250442)
+++ head/usr.sbin/ctladm/ctladm.c	Fri May 10 09:58:32 2013	(r250443)
@@ -546,7 +546,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);
 	}
@@ -3493,7 +3494,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__,