raster pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=7fbfab4dc7bfd8c0c7c3c94954c99149400a241a
commit 7fbfab4dc7bfd8c0c7c3c94954c99149400a241a
Author: Jean Guyomarc'h <j...@guyomarch.bzh>
Date: Tue Aug 29 20:50:12 2017 +0200
evas: fix invalid return of evas_textgrid_cellrow_get()
evas_textgrid_cellrow_get() is supposed to return NULL if the row index
fed to the function is outside of the textgrid's range. It was instead
returning garbage pointer.
@fix
---
src/lib/evas/canvas/evas_object_textgrid.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c
b/src/lib/evas/canvas/evas_object_textgrid.c
index 0955c4a53a..74c6d150f2 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1410,14 +1410,11 @@ _evas_textgrid_cellrow_set(Eo *eo_obj EINA_UNUSED,
Evas_Textgrid_Data *o, int y,
EOLIAN static Evas_Textgrid_Cell*
_evas_textgrid_cellrow_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data
*o, int y)
{
- Evas_Textgrid_Cell *ret;
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj,
EFL_CANVAS_OBJECT_CLASS);
evas_object_async_block(obj);
- if ((y < 0) || (y >= o->cur.h)) ret = NULL;
+ if ((y < 0) || (y >= o->cur.h)) return NULL;
- ret = o->cur.cells + (y * o->cur.w);
-
- return ret;
+ return o->cur.cells + (y * o->cur.w);
}
EOLIAN static void
--
