diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 064411e05c..1b312310c5 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -333,3 +333,7 @@
 	* Add smart instance usage count get function for ability to free
         data from memory from a smart class if needed.
 
+2011-05-12 Brian Wang
+
+	* Textblock: fix segfault with evas_textblock_cursor_content_get
+
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index aeeae4437d..85b066c923 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -6890,7 +6890,7 @@ evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur)
         tmp  = evas_textblock_node_format_text_get(
               _evas_textblock_node_visible_at_pos_get(
                  evas_textblock_cursor_format_get(cur)));
-        return strdup(tmp);
+        return (tmp) ? strdup(tmp) : NULL;
      }
 
    ustr = eina_ustrbuf_string_get(cur->node->unicode);