Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_netwm.c
Log Message:
some paranoia added for badly formed properties
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_netwm.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ecore_x_netwm.c 14 Sep 2005 03:26:23 -0000 1.39
+++ ecore_x_netwm.c 24 Sep 2005 11:36:22 -0000 1.40
@@ -637,6 +637,8 @@
if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_NET_WM_ICON,
XA_CARDINAL, 32, &data_ret, &num_ret))
return 0;
+ if (!data_ret) return 0;
+
data = (unsigned int *)data_ret;
if (icon)
@@ -651,8 +653,14 @@
len = data[0] * data[1];
src = &(data[2]);
- if (icon)
- memcpy(*icon, &(data[2]), len * sizeof(unsigned int));
+ if (len > (num_ret - 2))
+ {
+ if (icon) free(*icon);
+ free(data_ret);
+ return 0;
+ }
+ if (icon) memcpy(*icon, src, len * sizeof(unsigned int));
+
free(data_ret);
return 1;
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
