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

Add sanity checks.

This commit is contained in:
Hisham Muhammad 2014-04-24 12:15:56 -03:00
parent 823bdbae13
commit 34b89a9747
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ProcessList.c
View File

@ -217,7 +217,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList) {
fgets(buffer, 255, file); fgets(buffer, 255, file);
} while (String_startsWith(buffer, "cpu")); } while (String_startsWith(buffer, "cpu"));
fclose(file); fclose(file);
this->cpuCount = cpus - 1; this->cpuCount = MAX(cpus - 1, 1);
#ifdef HAVE_LIBHWLOC #ifdef HAVE_LIBHWLOC
this->topologyOk = false; this->topologyOk = false;
@ -724,7 +724,7 @@ static bool ProcessList_processEntries(ProcessList* this, const char* dirname, P
time_t curTime = tv.tv_sec; time_t curTime = tv.tv_sec;
#ifdef HAVE_TASKSTATS #ifdef HAVE_TASKSTATS
unsigned long long now = tv.tv_sec*1000+tv.tv_usec/1000; unsigned long long now = tv.tv_sec*1000LL+tv.tv_usec/1000LL;
#endif #endif
dir = opendir(dirname); dir = opendir(dirname);
@ -884,6 +884,7 @@ void ProcessList_scan(ProcessList* this) {
CRT_fatalError("Cannot open " PROCMEMINFOFILE); CRT_fatalError("Cannot open " PROCMEMINFOFILE);
} }
int cpus = this->cpuCount; int cpus = this->cpuCount;
assert(cpus > 0);
{ {
char buffer[128]; char buffer[128];
while (fgets(buffer, 128, file)) { while (fgets(buffer, 128, file)) {