From owner-svn-src-stable@FreeBSD.ORG  Mon Apr 18 08:53:23 2011
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 58183106564A;
	Mon, 18 Apr 2011 08:53:23 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 469248FC16;
	Mon, 18 Apr 2011 08:53:23 +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 p3I8rNqJ064659;
	Mon, 18 Apr 2011 08:53:23 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3I8rN58064657;
	Mon, 18 Apr 2011 08:53:23 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201104180853.p3I8rN58064657@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Mon, 18 Apr 2011 08:53:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220766 - stable/7/lib/libdevstat
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: Mon, 18 Apr 2011 08:53:23 -0000

Author: pluknet
Date: Mon Apr 18 08:53:22 2011
New Revision: 220766
URL: http://svn.freebsd.org/changeset/base/220766

Log:
  MFC r220319:
  
   Do not increment num_args if strsep(3) returned an empty field.
   That fixes devstat_buildmatch(3) crashes with certain strings.
  
  Reported by:	arundel

Modified:
  stable/7/lib/libdevstat/devstat.c
Directory Properties:
  stable/7/lib/libdevstat/   (props changed)

Modified: stable/7/lib/libdevstat/devstat.c
==============================================================================
--- stable/7/lib/libdevstat/devstat.c	Mon Apr 18 08:49:25 2011	(r220765)
+++ stable/7/lib/libdevstat/devstat.c	Mon Apr 18 08:53:22 2011	(r220766)
@@ -1014,11 +1014,12 @@ devstat_buildmatch(char *match_str, stru
 	 * Break the (comma delimited) input string out into separate strings.
 	 */
 	for (tempstr = tstr, num_args  = 0; 
-	     (*tempstr = strsep(&match_str, ",")) != NULL && (num_args < 5); 
-	     num_args++)
-		if (**tempstr != '\0')
+	     (*tempstr = strsep(&match_str, ",")) != NULL && (num_args < 5);)
+		if (**tempstr != '\0') {
+			num_args++;
 			if (++tempstr >= &tstr[5])
 				break;
+		}
 
 	/* The user gave us too many type arguments */
 	if (num_args > 3) {