summaryrefslogtreecommitdiffstats
path: root/openbsd
diff options
context:
space:
mode:
authorHisham <hisham@gobolinux.org>2016-02-02 15:53:02 +0100
committerHisham <hisham@gobolinux.org>2016-02-02 15:53:02 +0100
commitb54d2dde407921caa7561dde6b45831ba93d0840 (patch)
treecd81eea35dd65e46d22f2801ea403e1efc06eb59 /openbsd
parenta1f7f2869ec2bd860d5b4e4b39736ca877afdf6f (diff)
Check for failure in allocations.
Diffstat (limited to 'openbsd')
-rw-r--r--openbsd/OpenBSDProcess.c2
-rw-r--r--openbsd/OpenBSDProcessList.c10
-rw-r--r--openbsd/Platform.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c
index 65caf72b..71c84e8c 100644
--- a/openbsd/OpenBSDProcess.c
+++ b/openbsd/OpenBSDProcess.c
@@ -186,7 +186,7 @@ ProcessPidColumn Process_pidColumns[] = {
};
OpenBSDProcess* OpenBSDProcess_new(Settings* settings) {
- OpenBSDProcess* this = calloc(sizeof(OpenBSDProcess), 1);
+ OpenBSDProcess* this = xCalloc(sizeof(OpenBSDProcess), 1);
Object_setClass(this, Class(OpenBSDProcess));
Process_init(&this->super, settings);
return this;
diff --git a/openbsd/OpenBSDProcessList.c b/openbsd/OpenBSDProcessList.c
index c902d2bd..97e40cb8 100644
--- a/openbsd/OpenBSDProcessList.c
+++ b/openbsd/OpenBSDProcessList.c
@@ -53,7 +53,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
int mib[] = { CTL_HW, HW_NCPU };
int fmib[] = { CTL_KERN, KERN_FSCALE };
int i, e;
- OpenBSDProcessList* opl = calloc(1, sizeof(OpenBSDProcessList));
+ OpenBSDProcessList* opl = xCalloc(1, sizeof(OpenBSDProcessList));
ProcessList* pl = (ProcessList*) opl;
size_t size = sizeof(pl->cpuCount);
@@ -62,7 +62,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
if (e == -1 || pl->cpuCount < 1) {
pl->cpuCount = 1;
}
- opl->cpus = realloc(opl->cpus, pl->cpuCount * sizeof(CPUData));
+ opl->cpus = xRealloc(opl->cpus, pl->cpuCount * sizeof(CPUData));
size = sizeof(fscale);
if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0)
@@ -144,7 +144,7 @@ char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, in
*/
arg = kvm_getargv(kd, kproc, 500);
if (arg == NULL) {
- if ((s = strdup(kproc->p_comm)) == NULL) {
+ if ((s = xStrdup(kproc->p_comm)) == NULL) {
err(1, NULL);
}
return s;
@@ -152,8 +152,8 @@ char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, in
for (i = 0; arg[i] != NULL; i++) {
len += strlen(arg[i]) + 1;
}
- if ((buf = s = malloc(len)) == NULL) {
- if ((s = strdup(kproc->p_comm)) == NULL) {
+ if ((buf = s = xMalloc(len)) == NULL) {
+ if ((s = xStrdup(kproc->p_comm)) == NULL) {
err(1, NULL);
}
return s;
diff --git a/openbsd/Platform.c b/openbsd/Platform.c
index 90fbd2bc..251a7136 100644
--- a/openbsd/Platform.c
+++ b/openbsd/Platform.c
@@ -264,7 +264,7 @@ void Platform_setSwapValues(Meter* this) {
return;
}
- swdev = calloc(nswap, sizeof(*swdev));
+ swdev = xCalloc(nswap, sizeof(*swdev));
if (swdev == NULL) {
return;
}

© 2014-2024 Faster IT GmbH | imprint | privacy policy