+++ /dev/null
-From 0e9b2a152729bfd457e656a9258a06cbfdac1bae Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Mon, 14 Nov 2016 20:14:35 +0900
-Subject: Fix FcCacheOffsetsValid()
-
-Validation fails when the FcValueList contains more than font->num.
-this logic was wrong because font->num contains a number of the elements
-in FcPatternElt but FcValue in FcValueList.
-
-This corrects 7a4a5bd7.
-
-Patch from Tobias Stoeckmann
-
-diff --git a/src/fccache.c b/src/fccache.c
-index 02ec301..6f3c68a 100644
---- a/src/fccache.c
-+++ b/src/fccache.c
-@@ -640,6 +640,7 @@ FcCacheOffsetsValid (FcCache *cache)
- FcPattern *font = FcFontSetFont (fs, i);
- FcPatternElt *e;
- FcValueListPtr l;
-+ char *last_offset;
-
- if ((char *) font < base ||
- (char *) font > end - sizeof (FcFontSet) ||
-@@ -653,11 +654,17 @@ FcCacheOffsetsValid (FcCache *cache)
- if (e->values != 0 && !FcIsEncodedOffset(e->values))
- return FcFalse;
-
-- for (j = font->num, l = FcPatternEltValues(e); j >= 0 && l; j--, l = FcValueListNext(l))
-- if (l->next != NULL && !FcIsEncodedOffset(l->next))
-- break;
-- if (j < 0)
-- return FcFalse;
-+ for (j = 0; j < font->num; j++)
-+ {
-+ last_offset = (char *) font + font->elts_offset;
-+ for (l = FcPatternEltValues(&e[j]); l; l = FcValueListNext(l))
-+ {
-+ if ((char *) l < last_offset || (char *) l > end - sizeof (*l) ||
-+ (l->next != NULL && !FcIsEncodedOffset(l->next)))
-+ return FcFalse;
-+ last_offset = (char *) l + 1;
-+ }
-+ }
- }
- }
-
---
-cgit v0.10.2
-
+++ /dev/null
-diff -Naur fontconfig-2.11.94.orig/src/fccache.c fontconfig-2.11.94/src/fccache.c
---- fontconfig-2.11.94.orig/src/fccache.c 2015-05-27 23:53:27 +0000
-+++ fontconfig-2.11.94/src/fccache.c 2016-06-15 12:00:00 +0000
-@@ -34,6 +34,7 @@
- # include <unistd.h>
- # include <sys/mman.h>
- #endif
-+#include <emmintrin.h>
-
- #ifndef O_BINARY
- #define O_BINARY 0
-diff -Naur fontconfig-2.11.94.orig/src/fccfg.c fontconfig-2.11.94/src/fccfg.c
---- fontconfig-2.11.94.orig/src/fccfg.c 2015-04-09 00:19:17 +0000
-+++ fontconfig-2.11.94/src/fccfg.c 2014-06-15 12:00:00 +0000
-@@ -27,6 +27,7 @@
- #include "fcint.h"
- #include <dirent.h>
- #include <sys/types.h>
-+#include <emmintrin.h>
- #include "../fc-blanks/fcblanks.h"
-
- #if defined (_WIN32) && !defined (R_OK)
-diff -Naur fontconfig-2.11.94.orig/src/fcxml.c fontconfig-2.11.94/src/fcxml.c
---- fontconfig-2.11.94.orig/src/fcxml.c 2015-05-28 05:53:27.000000000 +0000
-+++ fontconfig-2.11.94/src/fcxml.c 2016-06-15 12:00:00 +0000
-@@ -26,6 +26,7 @@
- #include <fcntl.h>
- #include <stdarg.h>
- #include <dirent.h>
-+#include <emmintrin.h>
-
- #ifdef ENABLE_LIBXML2
-
-diff -Naur fontconfig-2.11.0/src/fcdefault.c fontconfig-2.11.0.new/src/fcdefault.c
---- fontconfig-2.11.0/src/fcdefault.c 2013-10-11 03:10:18 +0000
-+++ fontconfig-2.11.0.new/src/fcdefault.c 2014-02-15 18:44:53 +0000
-@@ -25,6 +25,7 @@
- #include "fcint.h"
- #include <limits.h>
- #include <string.h>
-+#include <emmintrin.h>
-
- /* MT-safe */
-
-diff -Naur fontconfig-2.11.0/src/fcobjs.c fontconfig-2.11.0.new/src/fcobjs.c
---- fontconfig-2.11.0/src/fcobjs.c 2013-10-11 03:10:18 +0000
-+++ fontconfig-2.11.0.new/src/fcobjs.c 2014-02-15 18:45:17 +0000
-@@ -33,6 +33,7 @@
- #include "fcobjshash.h"
-
- #include <string.h>
-+#include <emmintrin.h>
-
- /* The 1000 is to leave some room for future added internal objects, such
- * that caches from newer fontconfig can still be used with older fontconfig
-
+++ /dev/null
-__deps__ := FREETYPE LIBXML2 LIBICONV
-$(eval $(call import.MODULE.defs,FONTCONFIG,fontconfig,$(__deps__)))
-$(eval $(call import.CONTRIB.defs,FONTCONFIG))
-
-FONTCONFIG.FETCH.url = https://download.handbrake.fr/handbrake/contrib/fontconfig-2.12.1.tar.bz2
-FONTCONFIG.FETCH.url += https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.bz2
-FONTCONFIG.FETCH.sha256 = b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
-
-ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system))
- FONTCONFIG.CONFIGURE.env += ac_cv_func_mkostemp="no"
- FONTCONFIG.BUILD.env += ac_cv_func_mkostemp="no"
-endif
-
-#
-# Under MinGW:
-#
-# - A 'i386-ming32-gcc' $(FONTCONFIG.GCC.gcc) command will be available,
-# and the '-arch <arch>' argument should be omitted, as it will confuse this compiler.
-#
-# - The $(FONTCONFIG.GCC.archs) variable is not set.
-# Therefore statically guess the target arch to be i386.
-#
-ifeq ($(BUILD.system),mingw)
- FONTCONFIG.cc_archoption =
- FONTCONFIG.config_archoption = --with-arch=i386
-else ifeq ($(BUILD.system),linux)
- FONTCONFIG.cc_archoption =
-else ifeq ($(BUILD.system),solaris)
- FONTCONFIG.cc_archoption =
-else
- FONTCONFIG.cc_archoption = -arch $(FONTCONFIG.GCC.archs)
- FONTCONFIG.config_archoption = --with-arch=$(FONTCONFIG.GCC.archs)
-endif
-
-#
-# Support cross-compiling:
-#
-# - Add '-arch <arch>' to CC argument to avoid the need to put a <host_triplet>-gcc
-# trampoline script in the PATH, since fontconfig's configure looks for this when
-# in cross-compile mode. If such a trampoline were used, it would just call "gcc -arch <arch> $@".
-#
-# - In the case of MinGW (on i386), a 'i386-ming32-gcc' command will be available,
-# and the '-arch <arch>' argument should be omitted, as it will confuse the compiler.
-#
-# The following line overrides the original line in /make/include/contrib.defs,
-# but has the -arch argument added (and '$(1)' presubstituted for 'FONTCONFIG').
-#
-FONTCONFIG.CONFIGURE.env.CC = CC="$(FONTCONFIG.GCC.gcc) $(FONTCONFIG.cc_archoption)"
-
-#
-# Support cross-compiling:
-# - Remove '-arch <arch>' from *FLAGS variables, since fontconfig's configure script
-# needs to be given the freedom to insert that flag as necessary, since there are
-# some trampoline executables that need to be built in the native build architecture
-# (without the -arch flag).
-#
-# The following lines override the original lines in /make/include/contrib.defs,
-# but have '*archs' removed (and '$(1)' presubstituted for 'FONTCONFIG').
-#
-ifeq (max,$(FONTCONFIG.GCC.g))
- ifeq (none,$(FONTCONFIG.GCC.O))
- FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?c_std ?extra .g .O)"
- FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
- else
- FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?c_std ?extra .g)"
- FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
- endif
-else
- FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?c_std ?extra)"
- FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
-endif
-
-FONTCONFIG.CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
-FONTCONFIG.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver)"
-
-#
-# Force use of libxml2 instead of expat with --enable-libxml2.
-#
-# Tell configure where to find our (cross-compiled) versions of freetype and libxml2.
-#
-# Support cross-compiling:
-# - Add --with-arch argument since fontconfig's configure isn't smart enough
-# to infer it from the --host argument
-#
-FONTCONFIG.CONFIGURE.extra = \
- --enable-libxml2 \
- --with-freetype-config=$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/freetype-config) \
- $(FONTCONFIG.config_archoption) --disable-silent-rules
-
-ifeq (darwin,$(BUILD.system))
-FONTCONFIG.CONFIGURE.extra += \
- LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \
- LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \
- --with-baseconfigdir=/usr/X11/lib/X11/fontconfig \
- --with-cache-dir=~/Library/Caches/fontconfig \
- --with-default-fonts=/Library/Fonts \
- --with-add-fonts=/System/Library/Fonts,/Library/Fonts,~/Library/Fonts
-else ifeq (linux,$(BUILD.system))
-FONTCONFIG.CONFIGURE.extra += \
- --with-baseconfigdir=/etc/fonts \
- --with-cache-dir=/var/cache/fontconfig
-endif
-
-# work around Debian bug #768312
-FONTCONFIG.CONFIGURE.extra += --disable-docs
-
-# disable fc-cache test during install phase
-FONTCONFIG.INSTALL.extra = RUN_FC_CACHE_TEST=false
projects / handbrake / commitdiff