From 2a71e3885e0a716dc412b43e9b5de109d06a4d0a Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
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
---
 src/lib/elm_entry.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 5d2eab4..58e5b0a 100644
--- 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;
 }
-- 
2.7.4