From f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 7 Nov 2013 08:21:08 +0100
Subject: xextproto fontconfig libxcb mesa xserver git update  7 Nov 2013

xserver          commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be
libxcb           commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6
libxcb/xcb-proto commit 530817c5a926f006d8d61f9dcfd9ab73269a9805
xextproto        commit 3f355f138d6df57e067458a20f47307883048adb
fontconfig       commit a4443e64c89256087d40462cfbb482950873e366
mesa             commit 110009302bddb4c42a5b3ed5ca451d6bb50a06a0
---
 fontconfig/src/fcname.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'fontconfig/src/fcname.c')

diff --git a/fontconfig/src/fcname.c b/fontconfig/src/fcname.c
index 712b2fad3..f302948dd 100644
--- a/fontconfig/src/fcname.c
+++ b/fontconfig/src/fcname.c
@@ -420,6 +420,8 @@ FcNameParse (const FcChar8 *name)
 		if ((c = FcNameGetConstant (save)))
 		{
 		    t = FcNameGetObjectType ((char *) c->object);
+		    if (t == NULL)
+			goto bail2;
 		    switch ((int) t->type) {
 		    case FcTypeInteger:
 		    case FcTypeDouble:
-- 
cgit v1.2.3