From ed555d468c00c4bf482a7614c5659f1a712f95c5 Mon Sep 17 00:00:00 2001 From: Sangjin Lee Date: Mon, 5 Feb 2018 11:19:27 +0900 Subject: [PATCH] Fix DEREF_AFTER_NULL Change-Id: I3577df515032403dc5b3ac199f332c4c92b1ea9b --- src/lib/tdm/tdm-output.c | 10 ++++++---- src/lib/wayland/wayland-common.c | 8 ++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lib/tdm/tdm-output.c b/src/lib/tdm/tdm-output.c index 13cbbf3..f89c7df 100644 --- a/src/lib/tdm/tdm-output.c +++ b/src/lib/tdm/tdm-output.c @@ -634,10 +634,12 @@ pepper_tdm_output_init(pepper_tdm_t *tdm) return PEPPER_TRUE; error: - if (output->base) - pepper_output_destroy(output->base); - else - free(output); + if (output) { + if (output->base) + pepper_output_destroy(output->base); + else + free(output); + } return PEPPER_FALSE; } diff --git a/src/lib/wayland/wayland-common.c b/src/lib/wayland/wayland-common.c index 6254423..1e5c5f7 100644 --- a/src/lib/wayland/wayland-common.c +++ b/src/lib/wayland/wayland-common.c @@ -156,8 +156,12 @@ error: if (conn->gl_renderer) pepper_renderer_destroy(conn->gl_renderer); - string_free(conn->socket_name); - wl_display_disconnect(conn->display); + if (conn->socket_name) + string_free(conn->socket_name); + + if (conn->display) + wl_display_disconnect(conn->display); + free(conn); return NULL; -- 2.7.4