summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2004-08-09 22:37:22 +0000
committerKevin E Martin <kem@kem.org>2004-08-09 22:37:22 +0000
commit92487437173f600f208d825f65756d3ad14a4f7e (patch)
tree60708690e2e16742e034c1cdf4a7e17b116d2e90
parent55c2ee568e7d3903258286a13bdf96ce5348ffda (diff)
Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339, Harold L. Hunt II, Alexander Gottwald).XORG-6_7_99_1
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao, David Dawes). Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson). HP-PA build fix (Bug #828, Guy Martin, Paul Anderson). Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine). Fix attempt to read video ROM before enabling it (Bug #843, Ivan Kokshaysky, Mike A. Harris). Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A. Harris). Clarify xset man page description of how to use the keyboard repeat rate settings (Bug #846, Mike A. Harris). Fix problem where print-screen key would get remapped to sys-req in certain keymaps, which broke GNOME printscreen functionality (Bug #847, Owen Taylor). Fix several render problems: - MMIO mode support - Hang on IGP chips - VT switching hang - 3D render corruption (Bug #922, Hui Yu).
-rw-r--r--src/xlibi18n/lcUTF8.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c
index 0994e96..9caaf2e 100644
--- a/src/xlibi18n/lcUTF8.c
+++ b/src/xlibi18n/lcUTF8.c
@@ -1750,7 +1750,12 @@ create_tofontcs_conv(
}
while (count-- > 0) {
XlcCharSet charset = _XlcGetCharSet(*value++);
- const char *name = charset->encoding_name;
+ const char *name;
+
+ if (charset == (XlcCharSet) NULL)
+ continue;
+
+ name = charset->encoding_name;
/* If it wasn't already encountered... */
for (k = num - 1; k >= 0; k--)
if (!strcmp(preferred[k]->name, name))