devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=16f4c5c35aa102d2af699ab01b0c754dbae15eb1
commit 16f4c5c35aa102d2af699ab01b0c754dbae15eb1
Author: Benjamin Jacobs <b...@spam.thsi.be>
Date: Thu Jun 9 09:31:40 2016 -0400
evas-wayland-egl: Make sure surface pointer is valid before using it
Summary:
Prevents the uninitialized surface pointer to be used when
glsym_evgl_native_surface_buffer_get is NULL.
Reviewers: devilhorns
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D4016
@fix
---
src/modules/evas/engines/wayland_egl/evas_engine.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 1252e91..c35c6dd 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -871,14 +871,14 @@ _native_cb_bind(void *image)
}
else if (n->ns.type == EVAS_NATIVE_SURFACE_EVASGL)
{
- if (n->ns_data.evasgl.surface)
+ if (n->ns_data.evasgl.surface && glsym_evgl_native_surface_buffer_get)
{
Eina_Bool is_egl_image = EINA_FALSE;
void *surface;
- if (glsym_evgl_native_surface_buffer_get)
- surface =
glsym_evgl_native_surface_buffer_get(n->ns_data.evasgl.surface, &is_egl_image);
-
+ surface =
+ glsym_evgl_native_surface_buffer_get(n->ns_data.evasgl.surface,
+ &is_egl_image);
if (is_egl_image)
{
if (glsym_glEGLImageTargetTexture2DOES)
--
