summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Willmann <d.willmann@samsung.com>2013-06-26 14:32:21 +0100
committerDaniel Willmann <d.willmann@samsung.com>2013-06-26 14:42:10 +0100
commitdd76f4cd057572a11e9330f1ae2aa737c7a14d21 (patch)
treeb87f94550af45712b9cf5d6921d94105a7906f07
parentadcde1f87ee6906bfe1ddab7ba0d05763b9577e6 (diff)
evas gl_x11: Fix uninitialized use of re in eng_output_flush()
In case of render_mode == EVAS_RENDER_MODE_ASYNC_INIT we're jumping directly to end which then calls evas_gl_preload_render_unlock(eng_preload_make_current, re); Make sure re is initialized with the render engine data so we don't dereference junk. Signed-off-by: Daniel Willmann <d.willmann@samsung.com>
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index 7fde46a037..980dc797eb 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1472,10 +1472,10 @@ static void
1472eng_output_flush(void *data, Evas_Render_Mode render_mode) 1472eng_output_flush(void *data, Evas_Render_Mode render_mode)
1473{ 1473{
1474 Render_Engine *re; 1474 Render_Engine *re;
1475 re = (Render_Engine *)data;
1475 1476
1476 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) goto end; 1477 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) goto end;
1477 1478
1478 re = (Render_Engine *)data;
1479 if (!_re_wincheck(re)) goto end; 1479 if (!_re_wincheck(re)) goto end;
1480 if (!re->win->draw.drew) goto end; 1480 if (!re->win->draw.drew) goto end;
1481 1481