rpms/xscreensaver/devel xscreensaver-5.00-localesegv.patch, NONE, 1.1 xscreensaver.spec, 1.23, 1.24

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4251

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.00-localesegv.patch 
Log Message:
* Fri Aug 18 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-17
- Very nasty segv problem was brought by me. Fixing......
 
* Thu Aug 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-16
- Move man entry to 6x (bug #197741)


xscreensaver-5.00-localesegv.patch:

--- NEW FILE xscreensaver-5.00-localesegv.patch ---
--- xscreensaver-5.00/hacks/screenhack.c.localesegv	2006-08-11 09:08:37.000000000 +0900
+++ xscreensaver-5.00/hacks/screenhack.c	2006-08-18 11:44:32.000000000 +0900
@@ -180,28 +180,27 @@
 #endif
     0
   };
-  int j;
+  int j1, j2;
 
-  for (j = 0; examine_locale[j]; j++)
+  for (j1 = 0; examine_locale[j1]; j1++)
     {
-      const char *current_locale = setlocale(examine_locale[j], NULL);
-      const char *env_locale = setlocale(examine_locale[j], "");
+      const char *current_locale = setlocale(examine_locale[j1], NULL);
+      const char *env_locale = setlocale(examine_locale[j1], "");
       const char *cmp_locale;
 
       if (!env_locale || !*env_locale) 
 	{
-	  setlocale(examine_locale[j], current_locale);
+	  setlocale(examine_locale[j1], current_locale);
 	  continue;
 	}
 
-      while ((cmp_locale = change_locale[j]))
+      for (j2 = 0; (cmp_locale = change_locale[j2]); j2++)
 	{
 	  if (!strncmp(env_locale, cmp_locale, strlen(cmp_locale)))
 	    {
-	      (void) setlocale(examine_locale[j], "C");
+	      (void) setlocale(examine_locale[j2], "C");
 	      continue;
 	    }
-	  j++;
 	}
     }
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xscreensaver.spec	11 Aug 2006 00:34:58 -0000	1.23
+++ xscreensaver.spec	18 Aug 2006 04:28:37 -0000	1.24
@@ -1,7 +1,7 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	16
+%define fedora_rel	17
 
 %define fedora_ver	5.91.1
 %define default_text 	%{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
@@ -34,6 +34,7 @@
 Patch110:	xscreensaver-5.00-fix-hacks.patch
 Patch111:	xscreensaver-5.00-kill-getimage.patch
 Patch112:	xscreensaver-5.00-po-correctdir.patch
+Patch113:	xscreensaver-5.00-localesegv.patch
 
 %package base
 Summary: 	A minimal installation of xscreensaver
@@ -109,6 +110,7 @@
 %patch110 -p1 -b .fix-hacks
 %patch111 -p1 -b .kill-getimage
 %patch112 -p1 -b .po-dir
+%patch113 -p1 -b .localesegv
 
 install -c -m644 -p %{SOURCE10} po/ja.po
 
@@ -302,6 +304,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Aug 18 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-17
+- Very nasty segv problem was brought by me. Fixing......
+ 
 * Thu Aug 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-16
 - Move man entry to 6x (bug #197741)