diff options
author | Hisham <hisham@gobolinux.org> | 2016-02-02 15:53:02 +0100 |
---|---|---|
committer | Hisham <hisham@gobolinux.org> | 2016-02-02 15:53:02 +0100 |
commit | b54d2dde407921caa7561dde6b45831ba93d0840 (patch) | |
tree | cd81eea35dd65e46d22f2801ea403e1efc06eb59 /linux | |
parent | a1f7f2869ec2bd860d5b4e4b39736ca877afdf6f (diff) |
Check for failure in allocations.
Diffstat (limited to 'linux')
-rw-r--r-- | linux/Battery.c | 2 | ||||
-rw-r--r-- | linux/LinuxProcess.c | 2 | ||||
-rw-r--r-- | linux/LinuxProcessList.c | 8 | ||||
-rw-r--r-- | linux/Platform.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/linux/Battery.c b/linux/Battery.c index ebf20372..572bad48 100644 --- a/linux/Battery.c +++ b/linux/Battery.c @@ -50,7 +50,7 @@ static unsigned long int parseBatInfo(const char *fileName, const unsigned short char* entryName = dirEntry->d_name; if (strncmp(entryName, "BAT", 3)) continue; - batteries[nBatteries] = strdup(entryName); + batteries[nBatteries] = xStrdup(entryName); nBatteries++; } closedir(batteryDir); diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index 84c7e38f..c6c3112d 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -242,7 +242,7 @@ ProcessClass LinuxProcess_class = { }; LinuxProcess* LinuxProcess_new(Settings* settings) { - LinuxProcess* this = calloc(1, sizeof(LinuxProcess)); + LinuxProcess* this = xCalloc(1, sizeof(LinuxProcess)); Object_setClass(this, Class(LinuxProcess)); Process_init(&this->super, settings); return this; diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 19820ada..9efe768e 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -89,7 +89,7 @@ typedef struct LinuxProcessList_ { #endif ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) { - LinuxProcessList* this = calloc(1, sizeof(LinuxProcessList)); + LinuxProcessList* this = xCalloc(1, sizeof(LinuxProcessList)); ProcessList* pl = &(this->super); ProcessList_init(pl, Class(LinuxProcess), usersTable, pidWhiteList, userId); @@ -108,7 +108,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui fclose(file); pl->cpuCount = MAX(cpus - 1, 1); - this->cpus = calloc(cpus, sizeof(CPUData)); + this->cpus = xCalloc(cpus, sizeof(CPUData)); for (int i = 0; i < cpus; i++) { this->cpus[i].totalTime = 1; @@ -366,7 +366,7 @@ static void LinuxProcessList_readCGroupFile(LinuxProcess* process, const char* d snprintf(filename, MAX_NAME, "%s/%s/cgroup", dirname, name); FILE* file = fopen(filename, "r"); if (!file) { - process->cgroup = strdup(""); + process->cgroup = xStrdup(""); return; } char output[PROC_LINE_LENGTH + 1]; @@ -389,7 +389,7 @@ static void LinuxProcessList_readCGroupFile(LinuxProcess* process, const char* d } fclose(file); free(process->cgroup); - process->cgroup = strdup(output); + process->cgroup = xStrdup(output); } #endif diff --git a/linux/Platform.c b/linux/Platform.c index 7b8a120b..04360ca3 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -220,16 +220,16 @@ char* Platform_getProcessEnv(pid_t pid) { char *env = NULL; if (fd) { size_t capacity = 4096, size = 0, bytes; - env = malloc(capacity); + env = xMalloc(capacity); while (env && (bytes = fread(env+size, 1, capacity-size, fd)) > 0) { size += bytes; capacity *= 2; - env = realloc(env, capacity); + env = xRealloc(env, capacity); } fclose(fd); if (size < 2 || env[size-1] || env[size-2]) { if (size + 2 < capacity) { - env = realloc(env, capacity+2); + env = xRealloc(env, capacity+2); } env[size] = 0; env[size+1] = 0; |