From e1834ace280962fc57f3e086299c980e0e07067f Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 21 Feb 2019 08:13:04 +0100 Subject: backend/drm: fix memory leak in realloc crtcs If *changed_outputs is not supplied by the calling function, track the local allocation with a bool variable and free the allocation at the end of the function. --- backend/drm/drm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index a7719727..12ed61ef 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -888,8 +888,9 @@ static void dealloc_crtc(struct wlr_drm_connector *conn) { static void realloc_crtcs(struct wlr_drm_backend *drm, bool *changed_outputs) { size_t num_outputs = wl_list_length(&drm->outputs); + bool changed_local = changed_outputs ? false : true; - if (changed_outputs == NULL) { + if (changed_local) { changed_outputs = calloc(num_outputs, sizeof(bool)); if (changed_outputs == NULL) { wlr_log(WLR_ERROR, "Allocation failed"); @@ -952,7 +953,7 @@ static void realloc_crtcs(struct wlr_drm_backend *drm, bool *changed_outputs) { connectors[crtc[i]]->desired_enabled) { wlr_log(WLR_DEBUG, "Could not match a CRTC for connected output %d", crtc[i]); - return; + goto free_changed_outputs; } } @@ -1021,6 +1022,11 @@ static void realloc_crtcs(struct wlr_drm_backend *drm, bool *changed_outputs) { wlr_output_damage_whole(&conn->output); } + +free_changed_outputs: + if (changed_local) { + free(changed_outputs); + } } static uint32_t get_possible_crtcs(int fd, drmModeRes *res, -- cgit v1.2.3