devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cec6793db4b3bf9838440889d7d774f5f8918d6c
commit cec6793db4b3bf9838440889d7d774f5f8918d6c Author: Chris Michael <[email protected]> Date: Thu Oct 5 09:51:00 2017 -0400 evas-gl-common: Fix dereference after null check Coverity reports that there may be a null pointer dereference here so check that 'error' exists before trying to set it. Fixes CID1374272 @fix Signed-off-by: Chris Michael <[email protected]> --- src/modules/evas/engines/gl_common/evas_gl_image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c index fe8aa5b62a..ca305cf748 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_image.c +++ b/src/modules/evas/engines/gl_common/evas_gl_image.c @@ -243,7 +243,7 @@ evas_gl_common_image_new_from_rgbaimage(Evas_Engine_GL_Context *gc, RGBA_Image * ((int)im_im->cache_entry.h > gc->shared->info.max_texture_size)) { evas_cache_image_drop(&(im_im->cache_entry)); - *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; + if (error) *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; return NULL; } */ @@ -259,7 +259,7 @@ evas_gl_common_image_new_from_rgbaimage(Evas_Engine_GL_Context *gc, RGBA_Image * gc->shared->images = eina_list_remove_list(gc->shared->images, l); gc->shared->images = eina_list_prepend(gc->shared->images, im); evas_gl_common_image_ref(im); - *error = EVAS_LOAD_ERROR_NONE; + if (error) *error = EVAS_LOAD_ERROR_NONE; return im; } } @@ -273,7 +273,7 @@ evas_gl_common_image_new_from_rgbaimage(Evas_Engine_GL_Context *gc, RGBA_Image * else #endif evas_cache_image_drop(&(im_im->cache_entry)); - *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; + if (error) *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; return NULL; } if (im_im->cache_entry.cspaces) --
