return "" if conv is null anyway (as thats a "" src string)

SVN revision: 47441

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 5d2eab42ef0d9d815010ba10c6360b2f1a599ef5..58e5b0a47f04409a3b7c6d81a58aed8664cca67c 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/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;
 }