diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-02-23 16:26:14 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2022-03-29 15:23:29 -0400 |
commit | 47bf86a3e5d9015f504de4d64942bd17a643b4e6 (patch) | |
tree | ba310fc58601e67e98d18ffca2a06500c28a7ab5 /meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch | |
parent | 50afe15c9db1a770428bc32cda413997b7c2b176 (diff) |
meta-agl-core: update weston
Update weston bbappend for weston 10.0 in poky master, and remove
now upstreamed patches.
Bug-AGL: SPEC-3819
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I5d10435ec9b7c18bb36e8a88f6853f1628e5b052
Diffstat (limited to 'meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch')
-rw-r--r-- | meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch b/meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch deleted file mode 100644 index 582a33161..000000000 --- a/meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d76947b6668e0fabe0a4551ac6c2c978f93768cd Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniels@collabora.com> -Upstream-Status: Backport -Date: Mon, 3 Feb 2020 20:01:21 +0000 -Subject: [PATCH] gl-renderer: Avoid double-free on init failure - -If gl-renderer fails its initialisation, we return to compositor -teardown, which will try to free the renderer if ec->renderer was set. -This is unfortunate when we've already torn it down whilst failing -gl-renderer init, so just clear the renderer member so we don't try to -tear down twice. - -Signed-off-by: Daniel Stone <daniels@collabora.com> -Reported-by: Emil Velikov <emil.velikov@collabora.com> ---- - libweston/renderer-gl/gl-renderer.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c -index a40db3607..79285c008 100644 ---- a/libweston/renderer-gl/gl-renderer.c -+++ b/libweston/renderer-gl/gl-renderer.c -@@ -3596,6 +3596,7 @@ fail_terminate: - eglTerminate(gr->egl_display); - fail: - free(gr); -+ ec->renderer = NULL; - return -1; - } - --- -2.33.0 - |