enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

ecore: fix ecore_x_selection_convert not taking selection length into account. 

SVN revision: 60382
This commit is contained in:
Cedric BAIL 2011-06-16 09:16:03 +00:00
parent 6be9967699
commit b414ea97fb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/ecore/ChangeLog
View File

@ -220,3 +220,7 @@
* Add ecore_con_ssl_client/server_upgrade to begin asynchronously upgrading an
existing connection to SSL/TLS, emitting ECORE_CON_CLIENT/SERVER_UPGRADE event
upon completion.
2011-06-16 Cedric Bail
* Fix ecore_x_selection_convert not taking selection length into account.

10
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c
View File

@ -600,8 +600,10 @@ _ecore_x_selection_converter_text(char *target,
#endif /* ifdef X_HAVE_UTF8_STRING */
else
return EINA_FALSE;
if (!(mystr = strdup(data)))
return EINA_FALSE;
mystr = alloca(size + 1);
memcpy(mystr, data, size);
mystr[size] = '\0';
#ifdef X_HAVE_UTF8_STRING
if (Xutf8TextListToTextProperty(_ecore_x_disp, &mystr, 1, style,
@ -611,13 +613,11 @@ _ecore_x_selection_converter_text(char *target,
*data_ret = malloc(bufsize);
if (!*data_ret)
{
free(mystr);
return EINA_FALSE;
}
memcpy(*data_ret, text_prop.value, bufsize);
*size_ret = bufsize;
XFree(text_prop.value);
free(mystr);
return EINA_TRUE;
}
@ -631,14 +631,12 @@ _ecore_x_selection_converter_text(char *target,
memcpy(*data_ret, text_prop.value, bufsize);
*size_ret = bufsize;
XFree(text_prop.value);
free(mystr);
return EINA_TRUE;
}
#endif /* ifdef X_HAVE_UTF8_STRING */
else
{
free(mystr);
return EINA_TRUE;
}
} /* _ecore_x_selection_converter_text */