ecore_x: Remove NULL check

to get here, old_data != NULL.

Fixes CID 1039648 and 1039649
This commit is contained in:
Sebastian Dransfeld 2013-12-07 18:02:21 +01:00
parent 1905fd4858
commit c8b8738612
1 changed files with 3 additions and 6 deletions

View File

@ -1035,8 +1035,7 @@ ecore_x_icccm_colormap_window_set(Ecore_X_Window win,
{ {
if (oldset[i] == subwin) if (oldset[i] == subwin)
{ {
if (old_data) free(old_data);
free(old_data);
old_data = NULL; old_data = NULL;
free(newset); free(newset);
@ -1094,8 +1093,7 @@ ecore_x_icccm_colormap_window_unset(Ecore_X_Window win,
XDeleteProperty(_ecore_x_disp, XDeleteProperty(_ecore_x_disp,
win, ECORE_X_ATOM_WM_COLORMAP_WINDOWS); win, ECORE_X_ATOM_WM_COLORMAP_WINDOWS);
if (_ecore_xlib_sync) ecore_x_sync(); if (_ecore_xlib_sync) ecore_x_sync();
if (old_data) free(old_data);
free(old_data);
old_data = NULL; old_data = NULL;
return; return;
@ -1115,8 +1113,7 @@ ecore_x_icccm_colormap_window_unset(Ecore_X_Window win,
32, 32,
data, data,
k); k);
if (old_data) free(old_data);
free(old_data);
old_data = NULL; old_data = NULL;
free(newset); free(newset);