[PATCH] [weston] Don't crash when eglCreateContext fails

Mariusz Ceier mceier+wayland at gmail.com
Sat Feb 8 11:11:24 PST 2014


eglCreateContext fails with every EGLConfig that
nvidia blob 334.16 provides causing NULL pointer
dereference in gl_renderer_destroy when destroying
fragment and fan bindings.

This should fix #74699.

Signed-off-by: Mariusz Ceier <mceier+wayland at gmail.com>
---
 src/gl-renderer.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index d03bce6..76325f4 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -1766,8 +1766,10 @@ gl_renderer_destroy(struct weston_compositor *ec)
 	wl_array_release(&gr->vertices);
 	wl_array_release(&gr->vtxcnt);
 
-	weston_binding_destroy(gr->fragment_binding);
-	weston_binding_destroy(gr->fan_binding);
+	if (gr->fragment_binding)
+		weston_binding_destroy(gr->fragment_binding);
+	if (gr->fan_binding)
+		weston_binding_destroy(gr->fan_binding);
 
 	free(gr);
 }
-- 
1.8.5.4



More information about the wayland-devel mailing list