From owner-svn-src-head@FreeBSD.ORG  Mon Oct  5 21:11:05 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40F8D106566B;
	Mon,  5 Oct 2009 21:11:05 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 308E38FC1C;
	Mon,  5 Oct 2009 21:11:05 +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 n95LB5cc025844;
	Mon, 5 Oct 2009 21:11:05 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n95LB5mH025841;
	Mon, 5 Oct 2009 21:11:05 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200910052111.n95LB5mH025841@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 5 Oct 2009 21:11:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197793 - head/lib/libc/gen
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 21:11:05 -0000

Author: delphij
Date: Mon Oct  5 21:11:04 2009
New Revision: 197793
URL: http://svn.freebsd.org/changeset/base/197793

Log:
  fts_open() requires that the list passed as argument to contain at least
  one path.  When the list is empty (contain only a NULL pointer), return
  EINVAL instead of pretending to succeed, which will cause a NULL pointer
  deference in a later fts_read() call.
  
  Noticed by:	Christoph Mallon (via rdivacky@)
  MFC after:	2 weeks

Modified:
  head/lib/libc/gen/fts.3
  head/lib/libc/gen/fts.c

Modified: head/lib/libc/gen/fts.3
==============================================================================
--- head/lib/libc/gen/fts.3	Mon Oct  5 20:38:36 2009	(r197792)
+++ head/lib/libc/gen/fts.3	Mon Oct  5 21:11:04 2009	(r197793)
@@ -28,7 +28,7 @@
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
 .\" $FreeBSD$
 .\"
-.Dd January 26, 2008
+.Dd October 5, 2009
 .Dt FTS 3
 .Os
 .Sh NAME
@@ -776,7 +776,7 @@ may fail and set
 as follows:
 .Bl -tag -width Er
 .It Bq Er EINVAL
-The options were invalid.
+The options were invalid, or the list were empty.
 .El
 .Sh SEE ALSO
 .Xr find 1 ,

Modified: head/lib/libc/gen/fts.c
==============================================================================
--- head/lib/libc/gen/fts.c	Mon Oct  5 20:38:36 2009	(r197792)
+++ head/lib/libc/gen/fts.c	Mon Oct  5 21:11:04 2009	(r197793)
@@ -124,6 +124,12 @@ fts_open(argv, options, compar)
 		return (NULL);
 	}
 
+	/* fts_open() requires at least one path */
+	if (*argv == NULL) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
 	/* Allocate/initialize the stream. */
 	if ((priv = malloc(sizeof(*priv))) == NULL)
 		return (NULL);