hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elementary/elm_entry : add some null checking codes. 

SVN revision: 63594
This commit is contained in:
WooHyun Jung 2011-09-25 02:56:54 +00:00
parent b7a22247f2
commit c879c55fad
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
legacy/elementary/src/lib/elm_entry.c
View File

@ -1891,10 +1891,13 @@ _text_append_idler(void *data)
static void static void
_add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit unit) _add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit unit)
{ {
int i = 0, unit_size; int i = 0, current_len = 0;
int current_len = strlen(*text); char *new_text;
char *new_text = *text;
if (!*text) return;
if (unit >= LENGTH_UNIT_LAST) return; if (unit >= LENGTH_UNIT_LAST) return;
new_text = *text;
current_len = strlen(*text);
while (*new_text) while (*new_text)
{ {
if (*new_text == '<') if (*new_text == '<')
@ -1908,7 +1911,8 @@ _add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit un
} }
else else
{ {
int idx = 0; int idx = 0, unit_size = 0;
char *markup, *utfstr;
if (*new_text == '&') if (*new_text == '&')
{ {
while (*(new_text + idx) != ';') while (*(new_text + idx) != ';')
@ -1917,15 +1921,21 @@ _add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit un
if (!*(new_text + idx)) break; if (!*(new_text + idx)) break;
} }
} }
char *markup;
idx = evas_string_char_next_get(new_text, idx, NULL); idx = evas_string_char_next_get(new_text, idx, NULL);
markup = malloc(idx + 1); markup = malloc(idx + 1);
if (!markup) return;
strncpy(markup, new_text, idx); strncpy(markup, new_text, idx);
markup[idx] = 0; markup[idx] = 0;
if (unit == LENGTH_UNIT_BYTE) utfstr = elm_entry_markup_to_utf8(markup);
unit_size = strlen(elm_entry_markup_to_utf8(markup)); if (utfstr)
else if (unit == LENGTH_UNIT_CHAR) {
unit_size = evas_string_char_len_get(elm_entry_markup_to_utf8(markup)); if (unit == LENGTH_UNIT_BYTE)
unit_size = strlen(utfstr);
else if (unit == LENGTH_UNIT_CHAR)
unit_size = evas_string_char_len_get(utfstr);
free(utfstr);
utfstr = NULL;
}
if (markup) if (markup)
{ {
free(markup); free(markup);