[Emacs-diffs] emacs/src process.c

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/12/05 07:07:54

Modified files:
        src            : process.c 

Log message:
        (procfs_system_process_attributes): Don't use cmd, cmdsize, and q 
without
        initializing them first.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/process.c?cvsroot=emacs&r1=1.567&r2=1.568

Patches:
Index: process.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/process.c,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -b -r1.567 -r1.568
--- process.c   2 Oct 2008 20:03:05 -0000       1.567
+++ process.c   5 Dec 2008 07:07:53 -0000       1.568
@@ -7246,9 +7246,9 @@
   char procbuf[1025], *p, *q;
   int fd;
   ssize_t nread;
-  const char *cmd;
+  const char *cmd = NULL;
   char *cmdline = NULL;
-  size_t cmdsize, cmdline_size;
+  size_t cmdsize = 0, cmdline_size;
   unsigned char c;
   int proc_id, ppid, uid, gid, pgrp, sess, tty, tpgid, thcount;
   unsigned long long utime, stime, cutime, cstime, start;
@@ -7300,7 +7300,6 @@
       procbuf[nread] = '\0';
       p = procbuf;
 
-      cmd = NULL;
       p = strchr (p, '(');
       if (p != NULL)
        {
@@ -7312,6 +7311,8 @@
              cmdsize = q - cmd;
            }
        }
+      else
+       q = NULL;
       if (cmd == NULL)
        {
          cmd = "???";
@@ -7452,6 +7453,10 @@
        }
       else
        {
+         if (!cmd)
+           cmd = "???";
+         if (!cmdsize)
+           cmdsize = strlen (cmd);
          cmdline_size = cmdsize + 2;
          cmdline = xmalloc (cmdline_size + 1);
          strcpy (cmdline, "[");