enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

elementary/gesture_layer - [E-devel] [Patch] elm_gesture_layer patc 

Hi,

On behalf of Rajeev Ranjan, I am submitting the elm_gesture_layer patch.

Change Log:
a. Variable was used after freeing in function _remove_touched_device, now storing return value of eina_list_remove and then freeing pointer.
b. gesture pointer was dereferenced before checking it against NULL in function _rotate_test. Now dereferencing happens after NULL check.
c. Added NULL check for pointer before using it in function _event_process which is dereferenced in function _add_touched_device.
d. Memory leak fix in function elm_gesture_layer_add. Now using ELM_WIDGET_STANDARD_SETUP which takes care of NULL checks and freeing memory in case of failure.

Please review it.
I'd appreciate any comments on this.

Thank you,

Signed-Off-By: Rajeev Ranjan <rajeev.r@samsung.com>
Signed-Off-By: Prince Kumar Dubey <prince.dubey@samsung.com>
Signed-Off-By: ChunEon Park <hermet@hermet.pe.kr>



SVN revision: 65680
This commit is contained in:
Rajeev Ranjan 2011-11-29 09:20:31 +00:00 committed by ChunEon Park
parent c66f21a87a
commit 10e1220af7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/elementary/src/lib/elm_gesture_layer.c
View File

@ -298,11 +298,13 @@ compare_device(const void *data1, const void *data2)
static Eina_List *
_remove_touched_device(Eina_List *list, Pointer_Event *pe)
{
Eina_List *lst = NULL;
Pointer_Event *p = eina_list_search_unsorted(list, compare_device, pe);
if (p)
{
lst = eina_list_remove(list, p);
free(p);
return eina_list_remove(list, p);
return lst;
}
return list;
@ -2755,7 +2757,7 @@ _rotate_test(Evas_Object *obj, Pointer_Event *pe, void *event_info,
if (!wd->gesture[g_type]) return;
Gesture_Info *gesture = wd->gesture[g_type];
Rotate_Type *st = gesture->data;
Rotate_Type *st;
if (gesture)
{
st = gesture->data;
@ -3091,6 +3093,8 @@ _event_process(void *data, Evas_Object *obj __UNUSED__,
if (_make_pointer_event(data, event_info, event_type, &_pe))
pe = &_pe;
if (!pe) return;
if (IS_TESTED(ELM_GESTURE_N_LONG_TAPS))
_n_long_tap_test(data, pe, event_info, event_type,
ELM_GESTURE_N_LONG_TAPS);
@ -3354,12 +3358,8 @@ elm_gesture_layer_add(Evas_Object *parent)
Evas *e;
Widget_Data *wd;
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
wd = ELM_NEW(Widget_Data);
e = evas_object_evas_get(parent);
if (!e) return NULL;
obj = elm_widget_add(e);
ELM_SET_WIDTYPE(widtype, "gesture_layer");
elm_widget_type_set(obj, "gesture_layer");
elm_widget_sub_object_add(parent, obj);