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

Use checked allocation wrappers

This commit is contained in:
Christian Göttsche 2020-09-21 14:27:32 +02:00 committed by cgzones
parent e0e5997c53
commit f9966b5be3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux/LinuxProcessList.c
View File

@ -73,7 +73,7 @@ static void LinuxProcessList_initTtyDrivers(LinuxProcessList* this) {
int bufSize = MAX_READ; int bufSize = MAX_READ;
int bufLen = 0; int bufLen = 0;
for(;;) { for(;;) {
buf = realloc(buf, bufSize); buf = xRealloc(buf, bufSize);
int size = xread(fd, buf + bufLen, MAX_READ); int size = xread(fd, buf + bufLen, MAX_READ);
if (size <= 0) { if (size <= 0) {
buf[bufLen] = '\0'; buf[bufLen] = '\0';
@ -89,7 +89,7 @@ static void LinuxProcessList_initTtyDrivers(LinuxProcessList* this) {
} }
int numDrivers = 0; int numDrivers = 0;
int allocd = 10; int allocd = 10;
ttyDrivers = malloc(sizeof(TtyDriver) * allocd); ttyDrivers = xMalloc(sizeof(TtyDriver) * allocd);
char* at = buf; char* at = buf;
while (*at != '\0') { while (*at != '\0') {
at = strchr(at, ' '); // skip first token at = strchr(at, ' '); // skip first token
@ -97,7 +97,7 @@ static void LinuxProcessList_initTtyDrivers(LinuxProcessList* this) {
char* token = at; // mark beginning of path char* token = at; // mark beginning of path
at = strchr(at, ' '); // find end of path at = strchr(at, ' '); // find end of path
*at = '\0'; at++; // clear and skip *at = '\0'; at++; // clear and skip
ttyDrivers[numDrivers].path = strdup(token); // save ttyDrivers[numDrivers].path = xStrdup(token); // save
while (*at == ' ') at++; // skip spaces while (*at == ' ') at++; // skip spaces
token = at; // mark beginning of major token = at; // mark beginning of major
at = strchr(at, ' '); // find end of major at = strchr(at, ' '); // find end of major
@ -123,12 +123,12 @@ static void LinuxProcessList_initTtyDrivers(LinuxProcessList* this) {
numDrivers++; numDrivers++;
if (numDrivers == allocd) { if (numDrivers == allocd) {
allocd += 10; allocd += 10;
ttyDrivers = realloc(ttyDrivers, sizeof(TtyDriver) * allocd); ttyDrivers = xRealloc(ttyDrivers, sizeof(TtyDriver) * allocd);
} }
} }
free(buf); free(buf);
numDrivers++; numDrivers++;
ttyDrivers = realloc(ttyDrivers, sizeof(TtyDriver) * numDrivers); ttyDrivers = xRealloc(ttyDrivers, sizeof(TtyDriver) * numDrivers);
ttyDrivers[numDrivers - 1].path = NULL; ttyDrivers[numDrivers - 1].path = NULL;
qsort(ttyDrivers, numDrivers - 1, sizeof(TtyDriver), sortTtyDrivers); qsort(ttyDrivers, numDrivers - 1, sizeof(TtyDriver), sortTtyDrivers);
this->ttyDrivers = ttyDrivers; this->ttyDrivers = ttyDrivers;
@ -773,7 +773,7 @@ static char* LinuxProcessList_updateTtyDevice(TtyDriver* ttyDrivers, unsigned in
idx = min; idx = min;
} }
int err = stat(ttyDrivers[i].path, &sstat); int err = stat(ttyDrivers[i].path, &sstat);
if (err == 0 && tty_nr == sstat.st_rdev) return strdup(ttyDrivers[i].path); if (err == 0 && tty_nr == sstat.st_rdev) return xStrdup(ttyDrivers[i].path);
} }
char* out; char* out;
xAsprintf(&out, "/dev/%u:%u", maj, min); xAsprintf(&out, "/dev/%u:%u", maj, min);