From 34b543251b0cdb4b97e115c6fa2cc49ee0005a42 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 25 Apr 2013 19:27:37 +0900 Subject: [PATCH] elementary/naviframe - fix null pointer access on naviframe item deletion. commit abdab0f1d2af96d445c54a4fcb4719f581f12012 Author: ChunEon Park @hermet.pe.kr> Date: Thu Apr 25 19:26:09 2013 +0900 Change-Id: Ia8513e72fe418db2f953b9b9eecc76d6b42f71a6 --- src/lib/elc_naviframe.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index fe37776..08b7d3e 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -465,15 +465,14 @@ _item_del_pre_hook(Elm_Object_Item *it) elm_widget_tree_unfocusable_set(VIEW(nit), EINA_TRUE); } - if (sd->stack->last->prev) - prev_it = EINA_INLIST_CONTAINER_GET - (sd->stack->last->prev, Elm_Naviframe_Item); - sd->stack = eina_inlist_remove(sd->stack, EINA_INLIST_GET(nit)); if (!sd->stack) elm_widget_resize_object_set(WIDGET(it), sd->dummy_edje); if (top && !sd->on_deletion) /* must raise another one */ { + if (sd->stack && sd->stack->last) + prev_it = EINA_INLIST_CONTAINER_GET(sd->stack->last, + Elm_Naviframe_Item); if (!prev_it) goto end; if (sd->freeze_events) -- 2.7.4