svn commit: r220766 - stable/7/lib/libdevstat

Sergey Kandaurov pluknet at FreeBSD.org
Mon Apr 18 08:53:23 UTC 2011


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


More information about the svn-src-stable mailing list