From 441a2ef86188d1e8c9500764846f2b6c5a0e2eb4 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 4 Oct 2012 02:47:15 +0000 Subject: [PATCH] elementary: Fixes copy&paste error and possible invalid memory access. Patch by Igor Murzov SVN revision: 77397 --- legacy/elementary/AUTHORS | 1 + legacy/elementary/ChangeLog | 5 +++++ legacy/elementary/NEWS | 2 ++ legacy/elementary/src/examples/codegen_example.c | 2 +- legacy/elementary/src/lib/elm_access.c | 4 ++-- legacy/elementary/src/lib/elm_flip.c | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/AUTHORS b/legacy/elementary/AUTHORS index cbb06e38d8..3c34010a96 100644 --- a/legacy/elementary/AUTHORS +++ b/legacy/elementary/AUTHORS @@ -64,3 +64,4 @@ Minseok Kim Jean-Philippe André JiHyeon Seol Flavio Ceolin +Igor Murzov \ No newline at end of file diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index f7770a0e74..02d8c78eb1 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -555,3 +555,8 @@ * add elm_calendar_displayed_time_get * add a signal display,changed to elm_calendar + +2012-10-04 Igor Murzov + + * fix copy&paste error in elm_flip. + * fix possible invalid memory access in elm_access. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index bdaff47516..83c247630b 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -34,6 +34,8 @@ Fixes: * Escape theme filename correctly. * Fix diskselector selection of middle item. * Fix multibuttonentry list corruption. + * Fix copy&paste error in elm_flip. + * Fix possible invalid memory access in elm_access. Removals: diff --git a/legacy/elementary/src/examples/codegen_example.c b/legacy/elementary/src/examples/codegen_example.c index de4d80820c..aeb11f7cf9 100644 --- a/legacy/elementary/src/examples/codegen_example.c +++ b/legacy/elementary/src/examples/codegen_example.c @@ -79,7 +79,7 @@ _button_create(Evas_Object *parent, const char *label) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *btn, *layout, *tbl_items[3]; + Evas_Object *win, *bg, *btn, *layout, *tbl_items[6]; const char *labels[] = {"One", "Two", "Three", "Four", "Five", "Six"}; int i; diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c index 8b55500288..6a5b868afe 100644 --- a/legacy/elementary/src/lib/elm_access.c +++ b/legacy/elementary/src/lib/elm_access.c @@ -691,13 +691,13 @@ _access_item_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, EAPI void _elm_access_widget_item_register(Elm_Widget_Item *item) { - Evas_Object *ao; - Evas_Object *ho = item->view; + Evas_Object *ao, *ho; Evas_Coord x, y, w, h; if (!item) return; // create access object + ho = item->view; ao = _elm_access_add(item->widget); evas_object_event_callback_add(ho, EVAS_CALLBACK_RESIZE, _content_resize, ao); diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c index a74ff35ed5..f7717189fe 100644 --- a/legacy/elementary/src/lib/elm_flip.c +++ b/legacy/elementary/src/lib/elm_flip.c @@ -874,7 +874,7 @@ _flip_show_hide(Evas_Object *obj) else { if (sd->front.content) - evas_object_hide(sd->front.clip); + evas_object_show(sd->front.clip); else evas_object_hide(sd->front.clip); if (sd->back.content)