selinux-procps/procps-3.2.8-setlocale.patch

   1 diff -Nur procps-3.2.8-orig/proc/sysinfo.c procps-3.2.8/proc/sysinfo.c
   2 --- procps-3.2.8-orig/proc/sysinfo.c    2008-03-24 05:33:43.000000000 +0100
   3 +++ procps-3.2.8/proc/sysinfo.c 2009-12-18 22:50:52.000000000 +0100
   4 @@ -74,17 +74,19 @@
   5  /***********************************************************************/
   6  int uptime(double *restrict uptime_secs, double *restrict idle_secs) {
   7      double up=0, idle=0;
   8 -    char *restrict savelocale;
   9 +    char *savelocale;
  10
  11      FILE_TO_BUF(UPTIME_FILE,uptime_fd);
  12 -    savelocale = setlocale(LC_NUMERIC, NULL);
  13 +    savelocale = strdup(setlocale(LC_NUMERIC, NULL));
  14      setlocale(LC_NUMERIC,"C");
  15      if (sscanf(buf, "%lf %lf", &up, &idle) < 2) {
  16          setlocale(LC_NUMERIC,savelocale);
  17 +        free(savelocale);
  18          fputs("bad data in " UPTIME_FILE "\n", stderr);
  19             return 0;
  20      }
  21      setlocale(LC_NUMERIC,savelocale);
  22 +    free(savelocale);
  23      SET_IF_DESIRED(uptime_secs, up);
  24      SET_IF_DESIRED(idle_secs, idle);
  25      return up; /* assume never be zero seconds in practice */
  26 @@ -128,9 +130,9 @@
  27    double up_1, up_2, seconds;
  28    unsigned long long jiffies;
  29    unsigned h;
  30 -  char *restrict savelocale;
  31 +  char *savelocale;
  32
  33 -  savelocale = setlocale(LC_NUMERIC, NULL);
  34 +  savelocale = strdup(setlocale(LC_NUMERIC, NULL));
  35    setlocale(LC_NUMERIC, "C");
  36    do{
  37      FILE_TO_BUF(UPTIME_FILE,uptime_fd);  sscanf(buf, "%lf", &up_1);
  38 @@ -141,6 +143,7 @@
  39      /* uptime(&up_2, NULL); */
  40    } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
  41    setlocale(LC_NUMERIC, savelocale);
  42 +  free(savelocale);
  43    jiffies = user_j + nice_j + sys_j + other_j;
  44    seconds = (up_1 + up_2) / 2;
  45    h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
  46 @@ -303,16 +306,18 @@
  47  /***********************************************************************/
  48  void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) {
  49      double avg_1=0, avg_5=0, avg_15=0;
  50 -    char *restrict savelocale;
  51 +    char *savelocale;
  52
  53      FILE_TO_BUF(LOADAVG_FILE,loadavg_fd);
  54 -    savelocale = setlocale(LC_NUMERIC, NULL);
  55 +    savelocale = strdup(setlocale(LC_NUMERIC, NULL));
  56      setlocale(LC_NUMERIC, "C");
  57      if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) {
  58         fputs("bad data in " LOADAVG_FILE "\n", stderr);
  59 +    free(savelocale);
  60         exit(1);
  61      }
  62      setlocale(LC_NUMERIC, savelocale);
  63 +    free(savelocale);
  64      SET_IF_DESIRED(av1,  avg_1);
  65      SET_IF_DESIRED(av5,  avg_5);
  66      SET_IF_DESIRED(av15, avg_15);