From owner-p4-projects@FreeBSD.ORG Thu Jul 23 05:37:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85EE01065672; Thu, 23 Jul 2009 05:37:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4570E106566B for ; Thu, 23 Jul 2009 05:37:42 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 28E9D8FC0A for ; Thu, 23 Jul 2009 05:37:42 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6N5bfAH064486 for ; Thu, 23 Jul 2009 05:37:41 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6N5bfaM064484 for perforce@freebsd.org; Thu, 23 Jul 2009 05:37:41 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 23 Jul 2009 05:37:41 GMT Message-Id: <200907230537.n6N5bfaM064484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Cc: Subject: PERFORCE change 166430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jul 2009 05:37:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=166430 Change 166430 by jona@jona-trustedbsd-belle-vmware on 2009/07/23 05:36:50 mmap() can fail and return MAP_FAILED, not just NULL\! Affected files ... .. //depot/projects/trustedbsd/capabilities/qt-patches/x11-fonts/fontconfig/files/patch-bsd-capabilities.diff#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/qt-patches/x11-fonts/fontconfig/files/patch-bsd-capabilities.diff#2 (text+ko) ==== @@ -1,6 +1,6 @@ diff -ruN src/Makefile.am src/Makefile.am --- src/Makefile.am 2008-05-04 04:19:42.000000000 +0100 -+++ src/Makefile.am 2009-07-12 21:00:06.000000000 +0100 ++++ src/Makefile.am 2009-07-12 21:14:51.000000000 +0100 @@ -75,7 +75,8 @@ $(EXPAT_CFLAGS) \ $(WARN_CFLAGS) \ @@ -13,7 +13,7 @@ diff -ruN src/Makefile.in src/Makefile.in --- src/Makefile.in 2008-06-01 03:31:00.000000000 +0100 -+++ src/Makefile.in 2009-07-12 21:00:06.000000000 +0100 ++++ src/Makefile.in 2009-07-12 21:14:51.000000000 +0100 @@ -95,7 +95,7 @@ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -35,7 +35,7 @@ noinst_HEADERS = fcint.h fcftint.h fcdeprecate.h diff -ruN src/fccache.c src/fccache.c --- src/fccache.c 2007-11-14 00:36:41.000000000 +0000 -+++ src/fccache.c 2009-07-12 21:08:46.000000000 +0100 ++++ src/fccache.c 2009-07-23 06:30:10.000000000 +0100 @@ -37,6 +37,10 @@ # include #endif @@ -75,6 +75,15 @@ if (FcStat ((char *) dir, &dir_stat) < 0) return FcFalse; +@@ -568,7 +586,7 @@ + } + #endif + } +- if (!cache) ++ if (!cache || (cache == MAP_FAILED)) + { + cache = malloc (fd_stat->st_size); + if (!cache) @@ -893,6 +911,12 @@ if (!FcAtomicLock (atomic)) goto bail3; @@ -90,7 +99,7 @@ goto bail4; diff -ruN src/fccfg.c src/fccfg.c --- src/fccfg.c 2008-05-25 00:14:15.000000000 +0100 -+++ src/fccfg.c 2009-07-12 21:08:41.000000000 +0100 ++++ src/fccfg.c 2009-07-12 21:14:51.000000000 +0100 @@ -36,6 +36,10 @@ #define R_OK 4 #endif @@ -119,7 +128,7 @@ diff -ruN src/fcdir.c src/fcdir.c --- src/fcdir.c 2007-10-16 05:55:59.000000000 +0100 -+++ src/fcdir.c 2009-07-12 21:07:26.000000000 +0100 ++++ src/fcdir.c 2009-07-23 06:31:35.000000000 +0100 @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ @@ -131,7 +140,7 @@ #include "fcint.h" #include -@@ -30,8 +34,17 @@ +@@ -30,6 +34,14 @@ { struct stat statb; @@ -145,20 +154,11 @@ +#endif if (stat ((const char *) file, &statb) != 0) return FcFalse; -+ return S_ISDIR(statb.st_mode); - } - -@@ -161,10 +174,14 @@ - strcpy ((char *) file, (char *) dir); - strcat ((char *) file, "/"); - base = file + strlen ((char *) file); -- -+ +@@ -165,6 +177,10 @@ if (FcDebug () & FC_DBG_SCAN) printf ("\tScanning dir %s\n", dir); -- -+ + +#ifdef BSD_CAPABILITIES + if(ld_insandbox()) d = ua_opendir((char *) dir); + else @@ -168,7 +168,7 @@ { diff -ruN src/fcxml.c src/fcxml.c --- src/fcxml.c 2008-05-25 01:12:34.000000000 +0100 -+++ src/fcxml.c 2009-07-12 21:10:42.000000000 +0100 ++++ src/fcxml.c 2009-07-12 21:14:51.000000000 +0100 @@ -52,6 +52,10 @@ #endif /* ENABLE_LIBXML2 */