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

safety checks 

SVN revision: 14932
This commit is contained in:
Carsten Haitzler 2005-05-25 05:40:03 +00:00
parent bae19f7bea
commit cde252a7f6
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c
View File

@ -86,7 +86,7 @@ ecore_x_icccm_state_set(Ecore_X_Window win, Ecore_X_Window_State_Hint state)
Ecore_X_Window_State_Hint Ecore_X_Window_State_Hint
ecore_x_icccm_state_get(Ecore_X_Window win) ecore_x_icccm_state_get(Ecore_X_Window win)
{ {
unsigned char *prop_ret; unsigned char *prop_ret = NULL;
Atom type_ret; Atom type_ret;
unsigned long bytes_after, num_ret; unsigned long bytes_after, num_ret;
int format_ret; int format_ret;
@ -446,6 +446,7 @@ ecore_x_icccm_title_set(Ecore_X_Window win, const char *t)
XTextProperty xprop; XTextProperty xprop;
int ret; int ret;
xprop.value = NULL;
#ifdef X_HAVE_UTF8_STRING #ifdef X_HAVE_UTF8_STRING
list[0] = strdup(t); list[0] = strdup(t);
ret = ret =
@ -460,14 +461,14 @@ ecore_x_icccm_title_set(Ecore_X_Window win, const char *t)
if (ret >= Success) if (ret >= Success)
{ {
XSetWMName(_ecore_x_disp, win, &xprop); XSetWMName(_ecore_x_disp, win, &xprop);
XFree(xprop.value); if (xprop.value) XFree(xprop.value);
} }
else else
{ {
if (XStringListToTextProperty(list, 1, &xprop) >= Success) if (XStringListToTextProperty(list, 1, &xprop) >= Success)
{ {
XSetWMName(_ecore_x_disp, win, &xprop); XSetWMName(_ecore_x_disp, win, &xprop);
XFree(xprop.value); if (xprop.value) XFree(xprop.value);
} }
} }
free(list[0]); free(list[0]);
@ -478,6 +479,7 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
{ {
XTextProperty xprop; XTextProperty xprop;
xprop.value = NULL;
if (XGetWMName(_ecore_x_disp, win, &xprop) >= Success) if (XGetWMName(_ecore_x_disp, win, &xprop) >= Success)
{ {
if (xprop.value) if (xprop.value)
@ -518,8 +520,8 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
XFreeStringList(list); XFreeStringList(list);
} }
} }
XFree(xprop.value); if (xprop.value) XFree(xprop.value);
return t; return t;
} }
} }
@ -603,7 +605,7 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win,
leave: leave:
if (protos) if (protos)
XFree(protos); XFree(protos);
} }
@ -635,7 +637,7 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol)
break; break;
} }
XFree(protos); if (protos) XFree(protos);
return ret; return ret;
} }
@ -677,6 +679,8 @@ ecore_x_icccm_name_class_get(Ecore_X_Window win, char **n, char **c)
if (n) *n = NULL; if (n) *n = NULL;
if (c) *c = NULL; if (c) *c = NULL;
xch.res_name = NULL;
xch.res_class = NULL;
if (XGetClassHint(_ecore_x_disp, win, &xch)) if (XGetClassHint(_ecore_x_disp, win, &xch))
{ {
if (n) if (n)
@ -804,7 +808,8 @@ ecore_x_icccm_colormap_window_set(Ecore_X_Window win, Ecore_X_Window subwin)
{ {
if (oldset[i] == subwin) if (oldset[i] == subwin)
{ {
XFree(old_data); if (old_data) XFree(old_data);
old_data = NULL;
free(newset); free(newset);
return; return;
} }
@ -813,7 +818,7 @@ ecore_x_icccm_colormap_window_set(Ecore_X_Window win, Ecore_X_Window subwin)
} }
newset[num++] = subwin; newset[num++] = subwin;
XFree(old_data); if (old_data) XFree(old_data);
data = (unsigned char *)newset; data = (unsigned char *)newset;
} }
@ -851,7 +856,8 @@ ecore_x_icccm_colormap_window_unset(Ecore_X_Window win, Ecore_X_Window subwin)
{ {
XDeleteProperty(_ecore_x_disp, XDeleteProperty(_ecore_x_disp,
win, ECORE_X_ATOM_WM_COLORMAP_WINDOWS); win, ECORE_X_ATOM_WM_COLORMAP_WINDOWS);
XFree(old_data); if (old_data) XFree(old_data);
old_data = NULL;
return; return;
} }
else else
@ -864,14 +870,15 @@ ecore_x_icccm_colormap_window_unset(Ecore_X_Window win, Ecore_X_Window subwin)
ecore_x_window_prop_property_set(win, ecore_x_window_prop_property_set(win,
ECORE_X_ATOM_WM_COLORMAP_WINDOWS, ECORE_X_ATOM_WM_COLORMAP_WINDOWS,
XA_WINDOW, 32, data, k); XA_WINDOW, 32, data, k);
XFree(old_data); if (old_data) XFree(old_data);
old_data = NULL;
free(newset); free(newset);
return; return;
} }
} }
} }
XFree(old_data); if (old_data) XFree(old_data);
} }
/** /**