From 7c0ba8919712a1e23eca4b4785ab9f30f9e49a7e Mon Sep 17 00:00:00 2001
From: Connor E <38229097+c-edw@users.noreply.github.com>
Date: Fri, 18 Jan 2019 13:45:34 +0000
Subject: [PATCH] Handle alloc failures.

---
 main.c  | 6 ++++++
 pango.c | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/main.c b/main.c
index 0b97f85..000b16a 100644
--- a/main.c
+++ b/main.c
@@ -937,6 +937,12 @@ static int load_config(char *path, struct swaylock_state *state,
 
 		swaylock_log(LOG_DEBUG, "Config Line #%d: %s", line_number, line);
 		char *flag = malloc(nread + 3);
+		if (flag == NULL) {
+			free(line);
+			free(config);
+			swaylock_log(LOG_ERROR, "Failed to allocate memory");
+			return 0;
+		}
 		sprintf(flag, "--%s", line);
 		char *argv[] = {"swaylock", flag};
 		result = parse_options(2, argv, state, line_mode, NULL);
diff --git a/pango.c b/pango.c
index f40750b..8e80015 100644
--- a/pango.c
+++ b/pango.c
@@ -94,6 +94,10 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
 void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
 		int *baseline, double scale, bool markup, const char *fmt, ...) {
 	char *buf = malloc(max_chars);
+	if (buf == NULL) {
+		swaylock_log(LOG_ERROR, "Failed to allocate memory");
+		return;
+	}
 
 	va_list args;
 	va_start(args, fmt);
@@ -116,6 +120,10 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
 void pango_printf(cairo_t *cairo, const char *font,
 		double scale, bool markup, const char *fmt, ...) {
 	char *buf = malloc(max_chars);
+	if (buf == NULL) {
+		swaylock_log(LOG_ERROR, "Failed to allocate memory");
+		return;
+	}
 
 	va_list args;
 	va_start(args, fmt);