From dd8d60ad28c3eb79793866bc3169a9af731b4e3e Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 30 Nov 2017 11:44:23 -0600 Subject: [PATCH] wayland_shm: Move surface free into surface_destroy The caller shouldn't have to free this. --- src/modules/evas/engines/wayland_shm/evas_dmabuf.c | 2 ++ src/modules/evas/engines/wayland_shm/evas_outbuf.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c index b1221dfddd..a1d27b9e31 100644 --- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c @@ -142,6 +142,8 @@ _evas_dmabuf_surface_destroy(Surface *s) EINA_LIST_FREE(s->buffers, b) ecore_wl2_buffer_destroy(b); + + free(s); } Surface * diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c index 43ce340451..95280ac7da 100644 --- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c @@ -71,7 +71,6 @@ _evas_outbuf_free(Outbuf *ob) _evas_outbuf_idle_flush(ob); if (ob->surface) ob->surface->funcs.destroy(ob->surface); - free(ob->surface); eina_array_flush(&ob->priv.onebuf_regions);