svn commit: r196186 - in stable/7/usr.bin/locate: . locate

[John Baldwin]

Author: jhb
Date: Thu Aug 13 15:00:18 2009
New Revision: 196186
URL: http://svn.freebsd.org/changeset/base/196186

Log:
  MFC: Move the check to ensure the locate database has the minimum required
  size when using mmap() before invoking mmap().

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

Modified: stable/7/usr.bin/locate/locate/fastfind.c
==============================================================================
--- stable/7/usr.bin/locate/locate/fastfind.c	Thu Aug 13 14:59:04 2009	(r196185)
+++ stable/7/usr.bin/locate/locate/fastfind.c	Thu Aug 13 15:00:18 2009	(r196186)
@@ -154,9 +154,6 @@ fastfind
 
 	/* init bigram table */
 #ifdef FF_MMAP
-	if (len < (2*NBG))
-		errx(1, "database too small: %s", database);
-	
 	for (c = 0, p = bigram1, s = bigram2; c < NBG; c++, len-= 2) {
 		p[c] = check_bigram_char(*paddr++);
 		s[c] = check_bigram_char(*paddr++);

Modified: stable/7/usr.bin/locate/locate/locate.c
==============================================================================
--- stable/7/usr.bin/locate/locate/locate.c	Thu Aug 13 14:59:04 2009	(r196185)
+++ stable/7/usr.bin/locate/locate/locate.c	Thu Aug 13 15:00:18 2009	(r196186)
@@ -291,6 +291,8 @@ search_mmap(db, s)
 	    fstat(fd, &sb) == -1)
 		err(1, "`%s'", db);
 	len = sb.st_size;
+	if (len < (2*NBG))
+		errx(1, "database too small: %s", db);
 
 	if ((p = mmap((caddr_t)0, (size_t)len,
 		      PROT_READ, MAP_SHARED,