summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Cotton <jay.cotton@oracle.com>2011-02-02 22:09:34 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-02-13 16:54:21 -0800
commit652d9b47fc902e12c8e28481742c382676f1d035 (patch)
tree095f15248952d4d2d96f7bae2bb15bd24b6ac8e5
parent1e03ac60d1221d5c16b7f4797ab0c461f13b123a (diff)
downloadxorg-lib-libXft-652d9b47fc902e12c8e28481742c382676f1d035.tar.gz
XftDrawSrcPicture: fail if info->solidFormat is NULL
Fixed a core dump in x11perf render tests when a driver was returning incorrect information due to a bug in the driver. http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6872780 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/xftdraw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xftdraw.c b/src/xftdraw.c
index ab51749..21f8538 100644
--- a/src/xftdraw.c
+++ b/src/xftdraw.c
@@ -301,7 +301,7 @@ XftDrawSrcPicture (XftDraw *draw, _Xconst XftColor *color)
int i;
XftColor bitmapColor;
- if (!info)
+ if (!info || !info->solidFormat)
return 0;
/*