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

added some sanity checks to ecore_x_window_property_get 

SVN revision: 11505
This commit is contained in:
tsauerbeck 2004-09-02 18:22:19 +00:00 committed by tsauerbeck
parent 325cc6fe68
commit 88b64b0631
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/ecore/src/lib/ecore_x/ecore_x_window_prop.c
View File

@ -52,7 +52,15 @@ ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property, Ecor
int ret, size_ret = 0;
unsigned long num_ret = 0, bytes = 0, i;
unsigned char *prop_ret = NULL;
/* make sure these are initialized */
if (num) *num = 0;
if (data)
*data = NULL;
else /* we can't store the retrieved data, so just return */
return 0;
if (!win) win = DefaultRootWindow(_ecore_x_disp);
ret = XGetWindowProperty(_ecore_x_disp, win, property, 0, LONG_MAX,
@ -60,14 +68,10 @@ ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property, Ecor
&num_ret, &bytes, &prop_ret);
if (ret != Success)
{
*data = NULL;
return 0;
}
if (size != size_ret || !num_ret) {
XFree(prop_ret);
*data = NULL;
return 0;
}
@ -91,7 +95,7 @@ ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property, Ecor
XFree(prop_ret);
*num = num_ret;
if (num) *num = num_ret;
return 1;
}