summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2012-12-13 14:17:29 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2013-06-10 14:02:33 +0100
commit4bce980afffd7f274c7ce5551fa547a2ed57587e (patch)
tree84cc40235bbe1973d2688a8a3204c4be33e5a7ba
parent91cc5cf33cc22c9406283de27b7515d9767af064 (diff)
downloadelementary-4bce980afffd7f274c7ce5551fa547a2ed57587e.tar.gz
elm/naviframe: Fix potential deref of freed memory.
We should not free it and then access the same data again on line below. SVN revision: 80862
-rw-r--r--ChangeLog4
-rw-r--r--NEWS7
-rw-r--r--src/lib/elc_naviframe.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f7856fe7..af3ddec19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -817,3 +817,7 @@
2013-04-09 WooHyun Jung
* When ctxpopup includes elm_list, elm_list should get focus when ctxpopup is shown.
+
+2013-06-10 Stefan Schmidt
+
+ * Fix potential free'ed memory dereference in naviframe
diff --git a/NEWS b/NEWS
index 582ab361d..09f656ac5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes since Elementary 1.7.7:
+-------------------------
+
+Fixes:
+
+ * Fix potential free'ed memory dereference in naviframe.
+
Elementary 1.7.7
Changes since Elementary 1.7.6:
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 5e035b8f4..db73a335b 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -600,10 +600,10 @@ _title_content_set(Elm_Naviframe_Item *it,
eina_stringshare_del(pair->part);
it->content_list = eina_inlist_remove(it->content_list,
EINA_INLIST_GET(pair));
- free(pair);
evas_object_event_callback_del(pair->content,
EVAS_CALLBACK_DEL,
_title_content_del);
+ free(pair);
break;
}
}