From owner-svn-src-stable@FreeBSD.ORG  Sat Apr 11 14:13:39 2009
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 CDD3E106564A;
	Sat, 11 Apr 2009 14:13:39 +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 BB77A8FC15;
	Sat, 11 Apr 2009 14:13:39 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3BEDdiE088405;
	Sat, 11 Apr 2009 14:13:39 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3BEDdfq088403;
	Sat, 11 Apr 2009 14:13:39 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200904111413.n3BEDdfq088403@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 11 Apr 2009 14:13:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190922 - in stable/6/usr.bin/locate: . locate
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: Sat, 11 Apr 2009 14:13:40 -0000

Author: delphij
Date: Sat Apr 11 14:13:39 2009
New Revision: 190922
URL: http://svn.freebsd.org/changeset/base/190922

Log:
  MFC r190656:
  
  Fix a crash when corrupted data file is found.
  
  PR:             bin/32686

Modified:
  stable/6/usr.bin/locate/   (props changed)
  stable/6/usr.bin/locate/locate/fastfind.c

Modified: stable/6/usr.bin/locate/locate/fastfind.c
==============================================================================
--- stable/6/usr.bin/locate/locate/fastfind.c	Sat Apr 11 14:12:44 2009	(r190921)
+++ stable/6/usr.bin/locate/locate/fastfind.c	Sat Apr 11 14:13:39 2009	(r190922)
@@ -216,6 +216,8 @@ fastfind
 			count += c - OFFSET;
 		}
 
+		if (count < 0 || count > MAXPATHLEN)
+			errx(1, "corrupted database: %s", database);
 		/* overlay old path */
 		p = path + count;
 		foundchar = p - 1;