jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d4ab6ff90a4d5523ef264a29e845780c163fa044
commit d4ab6ff90a4d5523ef264a29e845780c163fa044 Author: Uma Devika <[email protected]> Date: Fri Jul 7 11:48:25 2017 +0900 Evas and Eolian : Freed string buffer Summary: Summary : String buffer returned by eina_strbuf_new() is not freed in some cases @Fix Signed-off-by: Uma Devika <[email protected]> Reviewers: cedric, tasn, jpeg, raster, singh.amitesh Subscribers: tanwar.umesh07, yashu21985, cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5000 --- src/lib/eolian/eo_parser.c | 2 ++ .../evas/engines/gl_common/evas_gl_api_ext.c | 34 ++++++++++++++-------- src/tests/evas/evas_test_image.c | 2 ++ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 5ae3f8788f..f4bcb83724 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -969,6 +969,7 @@ parse_typedef(Eo_Lexer *ls) pop_type(ls); check_next(ls, ';'); FILL_DOC(ls, def, doc); + pop_strbuf(ls); return def; } @@ -1016,6 +1017,7 @@ parse_variable(Eo_Lexer *ls, Eina_Bool global) } check_next(ls, ';'); FILL_DOC(ls, def, doc); + pop_strbuf(ls); return def; } diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c index f9f4259d1e..1169e79922 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c +++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c @@ -789,6 +789,8 @@ _evgl_api_gles2_ext_init(void *getproc, const char *glueexts) if (!glexts) { ERR("glGetString returned NULL! Something is very wrong..."); + eina_strbuf_free(sb); + eina_strbuf_free(sboff); return EINA_FALSE; } @@ -1033,25 +1035,25 @@ _evgl_api_gles1_ext_init(void *getproc, const char *glueexts) if (!(rsc=_evgl_tls_resource_get())) { ERR("Unable to initialize GLES1 extensions. Error retrieving tls"); - return EINA_FALSE; + goto error; } if ((dpy == EGL_NO_DISPLAY) || !rsc->current_ctx) { DBG("Unable to initialize GLES1 extensions. Engine not initialized"); - return EINA_FALSE; + goto error; } if (!eglQueryContext(dpy, rsc->current_ctx->context, EGL_CONTEXT_CLIENT_VERSION, &context_version)) { ERR("Unable to initialize GLES1 extensions. eglQueryContext failed 0x%x", eglGetError()); - return EINA_FALSE; + goto error; } if (context_version != EVAS_GL_GLES_1_X) { DBG("GLESv1 context not bound"); - return EINA_FALSE; + goto error; } #endif @@ -1059,14 +1061,14 @@ _evgl_api_gles1_ext_init(void *getproc, const char *glueexts) if (!gles1_funcs || !gles1_funcs->glGetString) { ERR("Could not get address of glGetString in GLESv1 library!"); - return EINA_FALSE; + goto error; } glexts = (const char *) gles1_funcs->glGetString(GL_EXTENSIONS); if (!glexts) { ERR("GLESv1:glGetString(GL_EXTENSIONS) returned NULL!"); - return EINA_FALSE; + goto error; } ///////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1226,6 +1228,10 @@ _evgl_api_gles1_ext_init(void *getproc, const char *glueexts) // GLESv1 version has been initialized! _evgl_api_ext_status |= EVASGL_API_GLES1_EXT_INITIALIZED; return EINA_TRUE; +error: + eina_strbuf_free(sb); + eina_strbuf_free(sboff); + return EINA_FALSE; } void @@ -1317,25 +1323,25 @@ _evgl_api_gles3_ext_init(void *getproc, const char *glueexts) if (!(rsc=_evgl_tls_resource_get())) { ERR("Unable to initialize GLES3 extensions. Error retrieving tls"); - return EINA_FALSE; + goto error; } if ((dpy == EGL_NO_DISPLAY) || !rsc->current_ctx) { DBG("Unable to initialize GLES3 extensions. Engine not initialized"); - return EINA_FALSE; + goto error; } if (!eglQueryContext(dpy, rsc->current_ctx->context, EGL_CONTEXT_CLIENT_VERSION, &context_version)) { ERR("Unable to initialize GLES3 extensions. eglQueryContext failed 0x%x", eglGetError()); - return EINA_FALSE; + goto error; } if (context_version != EVAS_GL_GLES_3_X) { DBG("GLESv3 context not bound"); - return EINA_FALSE; + goto error; } #endif @@ -1344,14 +1350,14 @@ _evgl_api_gles3_ext_init(void *getproc, const char *glueexts) if (!gles3_funcs || !gles3_funcs->glGetString) { ERR("Could not get address of glGetString in GLESv3 library!"); - return EINA_FALSE; + goto error; } glexts = (const char *) gles3_funcs->glGetString(GL_EXTENSIONS); if (!glexts) { ERR("GLESv3:glGetString(GL_EXTENSIONS) returned NULL!"); - return EINA_FALSE; + goto error; } ///////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1510,6 +1516,10 @@ _evgl_api_gles3_ext_init(void *getproc, const char *glueexts) // GLESv3 version has been initialized! _evgl_api_ext_status |= EVASGL_API_GLES3_EXT_INITIALIZED; return EINA_TRUE; +error: + eina_strbuf_free(sb); + eina_strbuf_free(sboff); + return EINA_FALSE; } void diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c index f5bd8c825f..c34a52da69 100644 --- a/src/tests/evas/evas_test_image.c +++ b/src/tests/evas/evas_test_image.c @@ -381,6 +381,8 @@ START_TEST(evas_object_image_tgv_loader_data) evas_object_del(obj); evas_object_del(ref); + eina_strbuf_free(str); + evas_free(e); evas_shutdown(); } --
