meta-agl-core/recipes-graphics/wayland: Backport two fixes for libweston-8
[AGL/meta-agl.git] / meta-agl-core / recipes-graphics / wayland / weston / 0001-gl-renderer-Avoid-double-free-on-init-failure.patch
1 From d76947b6668e0fabe0a4551ac6c2c978f93768cd Mon Sep 17 00:00:00 2001
2 From: Daniel Stone <daniels@collabora.com>
3 Upstream-Status: Backport
4 Date: Mon, 3 Feb 2020 20:01:21 +0000
5 Subject: [PATCH] gl-renderer: Avoid double-free on init failure
6
7 If gl-renderer fails its initialisation, we return to compositor
8 teardown, which will try to free the renderer if ec->renderer was set.
9 This is unfortunate when we've already torn it down whilst failing
10 gl-renderer init, so just clear the renderer member so we don't try to
11 tear down twice.
12
13 Signed-off-by: Daniel Stone <daniels@collabora.com>
14 Reported-by: Emil Velikov <emil.velikov@collabora.com>
15 ---
16  libweston/renderer-gl/gl-renderer.c | 1 +
17  1 file changed, 1 insertion(+)
18
19 diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
20 index a40db3607..79285c008 100644
21 --- a/libweston/renderer-gl/gl-renderer.c
22 +++ b/libweston/renderer-gl/gl-renderer.c
23 @@ -3596,6 +3596,7 @@ fail_terminate:
24         eglTerminate(gr->egl_display);
25  fail:
26         free(gr);
27 +       ec->renderer = NULL;
28         return -1;
29  }
30  
31 -- 
32 2.33.0
33