From 59961838f13f217c508d4f0165737271d131a718 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 25 Mar 2010 05:13:59 +0000 Subject: [PATCH] return "" if conv is null anyway (as thats a "" src string) SVN revision: 47441 --- legacy/elementary/src/lib/elm_entry.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 5d2eab42ef..58e5b0a47f 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -1552,11 +1552,15 @@ elm_entry_context_menu_disabled_get(const Evas_Object *obj) EAPI char * elm_entry_markup_to_utf8(const char *s) { - return _mkup_to_text(s); + char *ss = _mkup_to_text(s); + if (!ss) ss = strdup(""); + return ss; } EAPI char * elm_entry_utf8_to_markup(const char *s) { - return _text_to_mkup(s); + char *ss = _text_to_mkup(s); + if (!ss) ss = strdup(""); + return ss; }