Merge pull request #88 from 4e554c4c/alloc_crashing

Prevent alloc errors from crashing

2 files changed, 8 insertions, 4 deletions

diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index e63787d8..1f3c3eeb 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -241,8 +241,10 @@ static struct wlr_renderer_impl wlr_renderer_impl = {
 
 struct wlr_renderer *wlr_gles2_renderer_init(struct wlr_backend *backend) {
 	init_globals();
-	struct wlr_gles2_renderer *renderer =
-		calloc(1, sizeof(struct wlr_gles2_renderer));
+	struct wlr_gles2_renderer *renderer;
+	if (!(renderer = calloc(1, sizeof(struct wlr_gles2_renderer)))) {
+		return NULL;
+	}
 	wlr_renderer_init(&renderer->wlr_renderer, &wlr_renderer_impl);
 	if (backend) {
 		struct wlr_egl *egl = wlr_backend_get_egl(backend);
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index 4eb79374..6bb93e4f 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -277,8 +277,10 @@ static struct wlr_texture_impl wlr_texture_impl = {
 };
 
 struct wlr_texture *gles2_texture_init(struct wlr_egl *egl) {
-	struct wlr_gles2_texture *texture =
-		calloc(1, sizeof(struct wlr_gles2_texture));
+	struct wlr_gles2_texture *texture;
+	if (!(texture = calloc(1, sizeof(struct wlr_gles2_texture)))) {
+		return NULL;
+	}
 	wlr_texture_init(&texture->wlr_texture, &wlr_texture_impl);
 	texture->egl = egl;
 	return &texture->wlr_texture;