diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-28 18:36:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-28 18:36:59 +0000 |
| commit | ec2f03bcf805b62d93d3d95c184e671e9e32f9c3 (patch) | |
| tree | 043dc4679579e3fb114bbe44443d6745b184d84c /xorg-server/render | |
| parent | 447df0677e8b9998c47d541a041f0a6bb480e601 (diff) | |
| download | vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.tar.gz vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.tar.bz2 vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.zip | |
svn merge -r509:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/render')
| -rw-r--r-- | xorg-server/render/glyph.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/render/glyph.c b/xorg-server/render/glyph.c index 0b864ad4d..f0f3b1913 100644 --- a/xorg-server/render/glyph.c +++ b/xorg-server/render/glyph.c @@ -217,6 +217,9 @@ FindGlyphByHash (unsigned char sha1[20], int format) GlyphRefPtr gr; CARD32 signature = *(CARD32 *) sha1; + if (!globalGlyphs[format].hashSet) + return NULL; + gr = FindGlyphRef (&globalGlyphs[format], signature, TRUE, sha1); |