aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--reaper.c10
-rw-r--r--wayland.c14
2 files changed, 20 insertions, 4 deletions
diff --git a/reaper.c b/reaper.c
index e74dd6cd..adc89e3c 100644
--- a/reaper.c
+++ b/reaper.c
@@ -10,7 +10,6 @@
#define LOG_ENABLE_DBG 0
#include "log.h"
#include "tllist.h"
-#include "xmalloc.h"
struct reaper {
struct fdm *fdm;
@@ -40,7 +39,14 @@ reaper_init(struct fdm *fdm)
return NULL;
}
- struct reaper *reaper = xmalloc(sizeof(*reaper));
+ struct reaper *reaper = malloc(sizeof(*reaper));
+ if (unlikely(reaper == NULL)) {
+ LOG_ERRNO("malloc() failed");
+ close(fd);
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
+ return NULL;
+ }
+
*reaper = (struct reaper){
.fdm = fdm,
.fd = fd,
diff --git a/wayland.c b/wayland.c
index 2b5ab9b8..5f12d531 100644
--- a/wayland.c
+++ b/wayland.c
@@ -974,7 +974,12 @@ fdm_wayl(struct fdm *fdm, int fd, int events, void *data)
struct wayland *
wayl_init(const struct config *conf, struct fdm *fdm)
{
- struct wayland *wayl = xcalloc(1, sizeof(*wayl));
+ struct wayland *wayl = calloc(1, sizeof(*wayl));
+ if (unlikely(wayl == NULL)) {
+ LOG_ERRNO("calloc() failed");
+ return NULL;
+ }
+
wayl->conf = conf;
wayl->fdm = fdm;
wayl->fd = -1;
@@ -1131,7 +1136,12 @@ wayl_win_init(struct terminal *term)
struct wayland *wayl = term->wl;
const struct config *conf = term->conf;
- struct wl_window *win = xcalloc(1, sizeof(*win));
+ struct wl_window *win = calloc(1, sizeof(*win));
+ if (unlikely(win == NULL)) {
+ LOG_ERRNO("calloc() failed");
+ return NULL;
+ }
+
win->term = term;
win->use_csd = CSD_UNKNOWN;
win->csd.move_timeout_fd = -1;