summaryrefslogtreecommitdiff
path: root/xwayland
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2018-03-20 10:12:37 +0200
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2018-03-20 10:14:11 +0200
commit9fe5d5fae9d41bb5f9ec070dbbc0567c738f4141 (patch)
treea9f1fd764c0a8e191cbe271db04b49f3d81d9199 /xwayland
parentd2cb711d813e750b1e303e6200c027fd27a21f8e (diff)
downloadweston-9fe5d5fae9d41bb5f9ec070dbbc0567c738f4141.tar.gz
Revert "xwm: Fix memory leak"
This reverts commit d2cb711d813e750b1e303e6200c027fd27a21f8e. I missed the call to cairo_image_surface_create_for_data() which assumes the data will remain present until the cairo surface is destroyed. It seems the existence of data depends on the reply not being freed. This will need a more involved fix. Sorry, I noticed this just seconds after I pushed the patch. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'xwayland')
-rw-r--r--xwayland/window-manager.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 24e72132..c307e199 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -1387,8 +1387,6 @@ weston_wm_handle_icon(struct weston_wm *wm, struct weston_wm_window *window)
CAIRO_FORMAT_ARGB32,
width, height, width * 4);
- free(reply);
-
/* Bail out in case anything wrong happened during surface creation. */
if (cairo_surface_status(new_surface) != CAIRO_STATUS_SUCCESS) {
cairo_surface_destroy(new_surface);