[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src process.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs/src process.c |
Date: |
Fri, 05 Dec 2008 16:44:57 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/12/05 16:44:57
Modified files:
src : process.c
Log message:
(procfs_system_process_attributes): If `nread' has a negative value,
assign
zero to it.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/process.c?cvsroot=emacs&r1=1.568&r2=1.569
Patches:
Index: process.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/process.c,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -b -r1.568 -r1.569
--- process.c 5 Dec 2008 07:07:53 -0000 1.568
+++ process.c 5 Dec 2008 16:44:56 -0000 1.569
@@ -7434,6 +7434,14 @@
cmdline[0] = '\0';
if ((nread = read (fd, cmdline, cmdline_size)) >= 0)
cmdline[nread++] = '\0';
+ else
+ {
+ /* Assigning zero to `nread' makes us skip the following
+ two loops, assign zero to cmdline_size, and enter the
+ following `if' clause that handles unknown command
+ lines. */
+ nread = 0;
+ }
/* We don't want trailing null characters. */
for (p = cmdline + nread - 1; p > cmdline && !*p; p--)
nread--;
@@ -7451,7 +7459,7 @@
}
cmdline_size = nread;
}
- else
+ if (!cmdline_size)
{
if (!cmd)
cmd = "???";