rpms/procps/devel procps-3.2.8-setlocale.patch, NONE, 1.1 procps.spec, 1.84, 1.85

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/procps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14791

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.8-setlocale.patch 
Log Message:
fix #548711 -  [abrt] crash in procps-3.2.8-3.fc12


procps-3.2.8-setlocale.patch:
 sysinfo.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE procps-3.2.8-setlocale.patch ---
diff -Nur procps-3.2.8-orig/proc/sysinfo.c procps-3.2.8/proc/sysinfo.c
--- procps-3.2.8-orig/proc/sysinfo.c	2008-03-24 05:33:43.000000000 +0100
+++ procps-3.2.8/proc/sysinfo.c	2009-12-18 22:50:52.000000000 +0100
@@ -74,17 +74,19 @@
 /***********************************************************************/
 int uptime(double *restrict uptime_secs, double *restrict idle_secs) {
     double up=0, idle=0;
-    char *restrict savelocale;
+    char *savelocale;
 
     FILE_TO_BUF(UPTIME_FILE,uptime_fd);
-    savelocale = setlocale(LC_NUMERIC, NULL);
+    savelocale = strdup(setlocale(LC_NUMERIC, NULL));
     setlocale(LC_NUMERIC,"C");
     if (sscanf(buf, "%lf %lf", &up, &idle) < 2) {
         setlocale(LC_NUMERIC,savelocale);
+        free(savelocale);
         fputs("bad data in " UPTIME_FILE "\n", stderr);
 	    return 0;
     }
     setlocale(LC_NUMERIC,savelocale);
+    free(savelocale);
     SET_IF_DESIRED(uptime_secs, up);
     SET_IF_DESIRED(idle_secs, idle);
     return up;	/* assume never be zero seconds in practice */
@@ -128,9 +130,9 @@
   double up_1, up_2, seconds;
   unsigned long long jiffies;
   unsigned h;
-  char *restrict savelocale;
+  char *savelocale;
 
-  savelocale = setlocale(LC_NUMERIC, NULL);
+  savelocale = strdup(setlocale(LC_NUMERIC, NULL));
   setlocale(LC_NUMERIC, "C");
   do{
     FILE_TO_BUF(UPTIME_FILE,uptime_fd);  sscanf(buf, "%lf", &up_1);
@@ -141,6 +143,7 @@
     /* uptime(&up_2, NULL); */
   } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
   setlocale(LC_NUMERIC, savelocale);
+  free(savelocale);
   jiffies = user_j + nice_j + sys_j + other_j;
   seconds = (up_1 + up_2) / 2;
   h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
@@ -303,16 +306,18 @@
 /***********************************************************************/
 void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) {
     double avg_1=0, avg_5=0, avg_15=0;
-    char *restrict savelocale;
+    char *savelocale;
     
     FILE_TO_BUF(LOADAVG_FILE,loadavg_fd);
-    savelocale = setlocale(LC_NUMERIC, NULL);
+    savelocale = strdup(setlocale(LC_NUMERIC, NULL));
     setlocale(LC_NUMERIC, "C");
     if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) {
 	fputs("bad data in " LOADAVG_FILE "\n", stderr);
+    free(savelocale);
 	exit(1);
     }
     setlocale(LC_NUMERIC, savelocale);
+    free(savelocale);
     SET_IF_DESIRED(av1,  avg_1);
     SET_IF_DESIRED(av5,  avg_5);
     SET_IF_DESIRED(av15, avg_15);


Index: procps.spec
===================================================================
RCS file: /cvs/extras/rpms/procps/devel/procps.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- procps.spec	16 Nov 2009 14:09:38 -0000	1.84
+++ procps.spec	11 Jan 2010 14:27:12 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -86,6 +86,8 @@ Patch43: procps-3.2.7-free-hlmem.patch
 Patch44: procps-3.2.8-threads.patch
 # enable core file generation (don't trap it)
 Patch45: procps-enable-core.patch
+#548711 -  [abrt] crash in procps-3.2.8-3.fc12
+Patch46: procps-3.2.8-setlocale.patch
 
 BuildRequires: ncurses-devel
 
@@ -152,6 +154,7 @@ working directory of a process or proces
 %patch43 -p1
 %patch44 -p1
 %patch45 -p1
+%patch46 -p1
 
 cp %SOURCE1 .
 
@@ -189,6 +192,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Jan 11 2010 Daniel Novotny <dnovotny at redhat.com> 3.2.8-5
+- fix #548711 -  [abrt] crash in procps-3.2.8-3.fc12
+
 * Mon Nov 16 2009 Daniel Novotny <dnovotny at redhat.com> 3.2.8-4
 - patch for enabling core file generation in ps (we don't trap the signal anymore)