From f12b32955a65133125764207c16ce70a3dade07d Mon Sep 17 00:00:00 2001 From: Ryuan Choi Date: Thu, 18 Jul 2013 10:25:57 +0900 Subject: [PATCH] Revert "Remove redundant check routine what elm_entry_utf8_to_markup() returns." This commit is invalid. It just use strdup and strdup may return NULL when memory is not enough. This reverts commit f579f7fd4b5e863f01a001876e536f5becc40811. --- legacy/elementary/src/lib/elc_fileselector.c | 1 + legacy/elementary/src/lib/elc_fileselector_entry.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index 720df02bf1..2d675a2fc1 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -227,6 +227,7 @@ _anchors_do(Evas_Object *obj, ELM_FILESELECTOR_DATA_GET(obj, sd); s = elm_entry_utf8_to_markup(path); + if (!s) return; buf[0] = '\0'; tok = eina_str_split(s, "/", 0); diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index b1e19ed92d..f76f8dfaa7 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -79,6 +79,7 @@ _FILE_CHOSEN_fwd(void *data, ELM_FILESELECTOR_ENTRY_DATA_GET(data, sd); s = elm_entry_utf8_to_markup(file); + if (!s) return; elm_object_text_set(sd->entry, s); free(s); evas_object_smart_callback_call(data, SIG_FILE_CHOSEN, event_info); @@ -559,8 +560,11 @@ _path_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) elm_fileselector_button_path_set(sd->button, path); s = elm_entry_utf8_to_markup(path); - elm_object_text_set(sd->entry, s); - free(s); + if (s) + { + elm_object_text_set(sd->entry, s); + free(s); + } } EAPI const char *