summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@deville.herrb.com>2006-06-20 21:05:15 +0200
committerMatthieu Herrb <matthieu@deville.herrb.com>2006-06-20 21:05:15 +0200
commit4b8eb5d4a1da73a94b5a6ab12e34784aae4c79c5 (patch)
tree08425c141ed728fcf3b3c9304befc52afff25ff3
parent5169d0e08ff6acb350a6ea768623f5ff0b85b05f (diff)
parenteff50c94a07194297e705da53d9fbb3a40fb9ad4 (diff)
Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/lib/libX11
-rw-r--r--src/FSWrap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/FSWrap.c b/src/FSWrap.c
index d40f3b0..10634ce 100644
--- a/src/FSWrap.c
+++ b/src/FSWrap.c
@@ -256,6 +256,8 @@ XFontSetExtents *
XExtentsOfFontSet(font_set)
XFontSet font_set;
{
+ if (!font_set)
+ return NULL;
return &font_set->core.font_set_extents;
}