OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xlockmore?expand=0&rev=5

xlockmore-null-fontset.patch

@@ -0,0 +1,11 @@
+--- xlock/xlock.c
++++ xlock/xlock.c
+@@ -3367,6 +3367,8 @@
+ 
+ #ifdef USE_MB
+ 	fontset = createFontSet(dsp, fontsetname);
++	if (fontset == NULL)
++	  exit(1);
+ 	XmbTextExtents(fontset, "Aj", 1, NULL, &mbRect);
+ 	planfontset = createFontSet(dsp, planfontsetname);
+ 	XmbTextExtents(planfontset, "Aj", 1, NULL, &planmbRect);

xlockmore.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  5 14:12:40 CEST 2008 - pgajdos@suse.cz
+
+- prevented against segfault when wrong locale selected [#90543]
+  (null-fontset.patch)
+
 -------------------------------------------------------------------
 Tue Jun  3 11:26:09 CEST 2008 - pgajdos@suse.cz
 

xlockmore.spec

@@ -19,7 +19,7 @@ Provides:       xlock
 Obsoletes:      xlock
 AutoReqProv:    on
 Version:        5.25
-Release:        14
+Release:        16
 Summary:        Screen Saver and Locker for the X Window System
 Url:            http://www.tux.org/~bagleyd/xlockmore.html
 Source:         %{name}-%{version}.tar.bz2
@@ -36,6 +36,7 @@ Patch4:         xlockmore-ttf_dir_xorg6.patch
 Patch5:         xlockmore-gltt-libttf.patch
 Patch6:         xlockmore-gltt+ftgl.patch
 Patch7:         xlockmore-strict-aliasing.patch
+Patch8:         xlockmore-null-fontset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -88,6 +89,7 @@ Authors:
 %patch5
 %patch6
 %patch7
+%patch8
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
@@ -149,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jun 05 2008 pgajdos@suse.cz
+- prevented against segfault when wrong locale selected [#90543]
+  (null-fontset.patch)
 * Tue Jun 03 2008 pgajdos@suse.cz
 - removed mode text3d2 (xlockmore isn't linked against ftgl from
   now) [bnc#352683]