diff options
author | Derek Wang <derek.wang@sun.com> | 2006-06-19 11:05:37 -0700 |
---|---|---|
committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-06-22 15:28:20 -0700 |
commit | 605533f814ab7892991578706a6458f61a89ca4d (patch) | |
tree | 3299254a0f6413f6c81a8531a4fdb172bb93a2f7 | |
parent | 5bbd0822c5a926de0ed293437fb9f2b75cf3c4f4 (diff) | |
download | xorg-lib-libX11-605533f814ab7892991578706a6458f61a89ca4d.tar.gz |
Sun bug 6209243: XExtentsOfFontSet causes segfault when font set not loaded
(cherry picked from eff50c94a07194297e705da53d9fbb3a40fb9ad4 commit)
-rw-r--r-- | src/FSWrap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/FSWrap.c b/src/FSWrap.c index d40f3b03..10634cee 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; } |