zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return when reading cmdline fails (e.g. zombie process)

This commit is contained in:
Hisham 2016-08-24 18:11:10 -03:00
parent 16406ea330
commit bd5d37f297
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
linux/LinuxProcessList.c
View File

@ -471,23 +471,25 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, const char* dirna
close(fd); close(fd);
int tokenEnd = 0; int tokenEnd = 0;
int lastChar = 0; int lastChar = 0;
if (amtRead > 0) { if (amtRead <= 0) {
for (int i = 0; i < amtRead; i++) return false;
if (command[i] == '\0' || command[i] == '\n') { }
if (tokenEnd == 0) { for (int i = 0; i < amtRead; i++) {
tokenEnd = i; if (command[i] == '\0' || command[i] == '\n') {
} if (tokenEnd == 0) {
command[i] = ' '; tokenEnd = i;
} else {
lastChar = i;
} }
command[i] = ' ';
} else {
lastChar = i;
}
} }
if (tokenEnd == 0) { if (tokenEnd == 0) {
tokenEnd = amtRead; tokenEnd = amtRead;
} }
command[lastChar + 1] = '\0'; command[lastChar + 1] = '\0';
process->basenameOffset = tokenEnd; process->basenameOffset = tokenEnd;
setCommand(process, command, lastChar + 1); setCommand(process, command, lastChar);
return true; return true;
} }