[Entry] Merge with 69850 for fix elm_entry bug. Segfault when getting long sized...
authorWooHyun Jung <wh0705.jung@samsung.com>
Mon, 2 Apr 2012 07:47:33 +0000 (16:47 +0900)
committerWooHyun Jung <wh0705.jung@samsung.com>
Mon, 2 Apr 2012 07:47:33 +0000 (16:47 +0900)
src/lib/elm_entry.c

index 20a0b69..6a4fd20 100644 (file)
@@ -2896,7 +2896,8 @@ _elm_entry_text_get(const Evas_Object *obj, const char *item)
              return NULL;
           }
         memcpy(tmpbuf, text, tlen);
-        memcpy(tmpbuf + tlen, wd->append_text_left, wd->append_text_len);
+        if (wd->append_text_left)
+          memcpy(tmpbuf + tlen, wd->append_text_left, strlen(wd->append_text_left));
         tmpbuf[tlen + wd->append_text_len] = '\0';
         eina_stringshare_replace(&wd->text, tmpbuf);
         free(tmpbuf);