tags 384729 + patch
thanks
I played around a bit more with my core file and found the cause of
the bug: The fix for #360418 assumes that FLCXOMCharsetList will
alway be valid at the end of FlocaleInit_X_Charset(), but in my
case the XOpenOM() call failed, so FLCXOMCharsetList was still NULL
when the new code tried to read FLCXOMCharsetList[0].
The attached patch seems to fix the problem for me, by reverting
to the upstream strategy of doing nothing if XOpenOM() or
XGetOMValues() fail. But I'm not completely sure what is supposed to
be going on here, so it is not necessarily the Right Fix.
--
Henning Makholm "I Guds Faders namn, och Sonens, och den Helige
Andes! Bevara oss från djävulens verk och från Muhammeds,
den förbannades, illfundigheter! Med dig är det värre än med
någon annan, ty att lyssna till Muhammed är det värsta av allt."
diff -ur fvwm-2.5.17-2/debian/changelog fvwm-2.5.17/debian/changelog
--- fvwm-2.5.17-2/debian/changelog 2006-08-26 13:05:19.000000000 +0200
+++ fvwm-2.5.17/debian/changelog 2006-08-26 13:06:58.000000000 +0200
@@ -1,3 +1,9 @@
+fvwm (1:2.5.17-1makholm) unstable; urgency=low
+
+ * Test build hopefully fixing #384729
+
+ -- Henning Makholm <[EMAIL PROTECTED]> Sat, 26 Aug 2006 13:06:58 +0200
+
fvwm (1:2.5.17-1) unstable; urgency=low
* New upstream release
diff -ur fvwm-2.5.17-2/libs/FlocaleCharset.c fvwm-2.5.17/libs/FlocaleCharset.c
--- fvwm-2.5.17-2/libs/FlocaleCharset.c 2006-08-26 13:05:19.000000000 +0200
+++ fvwm-2.5.17/libs/FlocaleCharset.c 2006-08-26 13:07:30.000000000 +0200
@@ -523,7 +523,7 @@
if (FLCXOMCharsetList_num > 0 &&
FLCXOMCharsetList[FLCXOMCharsetList_num-1])
FLCXOMCharset = FLCXOMCharsetList[FLCXOMCharsetList_num-1];
- else
+ else if( FLCXOMCharsetList != NULL )
FLCXOMCharset = FLCXOMCharsetList[0];
#endif
}
