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

Linux: add reset to heuristic 

On hard to parse command lines tokenStart might be computed to be bigger
than tokenEnd.
Reset both values in such cases.
This commit is contained in:
Christian Göttsche 2021-05-23 15:53:23 +02:00 committed by cgzones
parent 550a141860
commit c408add108
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Process.c
View File

@ -1161,7 +1161,7 @@ static int skipPotentialPath(const char* cmdline, int end) {
void Process_updateCmdline(Process* this, const char* cmdline, int basenameStart, int basenameEnd) { void Process_updateCmdline(Process* this, const char* cmdline, int basenameStart, int basenameEnd) {
assert(basenameStart >= 0); assert(basenameStart >= 0);
assert((cmdline && basenameStart < (int)strlen(cmdline)) || (!cmdline && basenameStart == 0)); assert((cmdline && basenameStart < (int)strlen(cmdline)) || (!cmdline && basenameStart == 0));
assert(basenameEnd >= 0); assert((basenameEnd > basenameStart) || (basenameEnd == 0 && basenameStart == 0));
assert((cmdline && basenameEnd <= (int)strlen(cmdline)) || (!cmdline && basenameEnd == 0)); assert((cmdline && basenameEnd <= (int)strlen(cmdline)) || (!cmdline && basenameEnd == 0));
if (!this->cmdline && !cmdline) if (!this->cmdline && !cmdline)

7
linux/LinuxProcessList.c
View File

@ -1123,6 +1123,13 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc
} }
} }
} }
/* Some command lines are hard to parse, like
* file.so [kdeinit5] file local:/run/user/1000/klauncherdqbouY.1.slave-socket local:/run/user/1000/kded5TwsDAx.1.slave-socket
* Reset if start is behind end.
*/
if (tokenStart >= tokenEnd)
tokenStart = tokenEnd = 0;
} }
if (tokenEnd == 0) { if (tokenEnd == 0) {