[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Akira TAGOH]

 fontconfig/fontconfig.h |    3 ---
 src/fcdbg.c             |    2 +-
 src/fcint.h             |    3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit dbda1171427071ff31429ea6d36330bb8f193138
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Jun 9 11:15:25 2015 +0900

    No need to be public

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index eaeb3d9..b640235 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -831,9 +831,6 @@ FcPatternEqualSubset (const FcPattern *pa, const FcPattern *pb, const FcObjectSe
 FcPublic FcChar32
 FcPatternHash (const FcPattern *p);
 
-FcPublic int
-FcPatternPosition (const FcPattern *p, const char *object);
-
 FcPublic FcBool
 FcPatternAdd (FcPattern *p, const char *object, FcValue value, FcBool append);
     
diff --git a/src/fcint.h b/src/fcint.h
index 3ab9e02..0a98731 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -1040,6 +1040,9 @@ FcPatternObjectGetRange (const FcPattern *p, FcObject object, int id, FcRange **
 FcPrivate FcBool
 FcPatternAppend (FcPattern *p, FcPattern *s);
 
+FcPrivate int
+FcPatternPosition (const FcPattern *p, const char *object);
+
 FcPrivate FcChar32
 FcStringHash (const FcChar8 *s);
 
commit 359ada2b4c12b6b6c3b4c017f95a35f18a3c6dd7
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Jun 9 11:15:06 2015 +0900

    Fix a crash when no objects are available after filtering

diff --git a/src/fcdbg.c b/src/fcdbg.c
index 210fb57..c2853ff 100644
--- a/src/fcdbg.c
+++ b/src/fcdbg.c
@@ -235,7 +235,7 @@ FcPatternPrint2 (FcPattern         *pp1,
     {
 	e1 = &FcPatternElts(p1)[i];
 	e2 = &FcPatternElts(p2)[j];
-	if (e1->object != e2->object)
+	if (!e2 || e1->object != e2->object)
 	{
 	    pos = FcPatternPosition (p2, FcObjectName (e1->object));
 	    if (pos >= 0)