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

fix ecore_x_netwm_icons_get() 

SVN revision: 17346
This commit is contained in:
tsauerbeck 2005-10-09 09:56:47 +00:00 committed by tsauerbeck
parent 8c01f55114
commit 315c2a045b
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c
View File

@ -697,19 +697,6 @@ ecore_x_netwm_icons_get(Ecore_X_Window win, Ecore_X_Icon **icon, int *num)
return 0;
}
for (i = 0; i < icons; i++)
{
((*icon)[i]).data = malloc(len * sizeof(unsigned int));
if (!((*icon)[i]).data)
{
while (i)
free(((*icon)[--i]).data);
free(*icon);
free(data_ret);
return 0;
}
}
/* Fetch the icons */
p = data;
for (i = 0; i < icons; i++)
@ -719,6 +706,15 @@ ecore_x_netwm_icons_get(Ecore_X_Window win, Ecore_X_Icon **icon, int *num)
((*icon)[i]).height = p[1];
src = &(p[2]);
((*icon)[i]).data = malloc(len * sizeof(unsigned int));
if (!((*icon)[i]).data)
{
while (i)
free(((*icon)[--i]).data);
free(*icon);
free(data_ret);
return 0;
}
memcpy(((*icon)[i]).data, src, len * sizeof(unsigned int));
p += (len + 2);