From 63638f73934d861251f8cb180556e36a7a313c2e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 8 Mar 2011 01:00:21 +0000 Subject: [PATCH] _evas_gl_common_viewport_set segv fix: ROUND 2! SVN revision: 57561 --- legacy/evas/ChangeLog | 4 ++++ legacy/evas/src/modules/engines/gl_common/evas_gl_context.c | 1 + 2 files changed, 5 insertions(+) diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog index 3e796e7278..0ddbb3c18e 100644 --- a/legacy/evas/ChangeLog +++ b/legacy/evas/ChangeLog @@ -135,3 +135,7 @@ 2011-02-27 Vincent Torri * Fixed static linking of the bmp, wbmp and tga loaders + +2011-03-07 Mike Blumenkrantz + + * Fix segv when trying to set gl viewpoint with NULL ctx diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c index 67af362025..5006c76eee 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c @@ -292,6 +292,7 @@ _evas_gl_common_viewport_set(Evas_GL_Context *gc) GLfloat proj[16]; int w = 1, h = 1, m = 1, rot = 1, foc = 0; + EINA_SAFETY_ON_NULL_RETURN(gc); foc = gc->foc; // surface in pipe 0 will be the same as all pipes if ((gc->pipe[0].shader.surface == gc->def_surface) ||