Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        ewmh.c 


Log Message:
Fix bad _NET_WM_ICON consistency check.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- ewmh.c      16 Jul 2005 16:57:40 -0000      1.81
+++ ewmh.c      17 Jul 2005 10:22:49 -0000      1.82
@@ -609,7 +609,8 @@
 EWMH_GetWindowIcons(EWin * ewin)
 {
    unsigned int       *val;
-   int                 i, num;
+   unsigned int        i;
+   int                 num;
 
    if (ewin->ewmh.wm_icon)
      {
@@ -623,16 +624,16 @@
    if (num <= 0)
       return;
 
-   if (num < (int)(2 + val[0] * val[1]))
+   if (num < 2 || num < (int)(2 + val[0] * val[1]))
      {
        Eprintf
           ("*** EWMH_GetWindowIcons Icon data/size mismatch (ignoring): %s: 
N=%d WxH=%dx%d\n",
-           EwinGetName(ewin), num, val[0], val[1]);
+           EwinGetName(ewin), num, val[0], (num >= 2) ? val[1] : 0);
        Efree(val);
        return;
      }
 
-   for (i = 0; i < num - 1;)
+   for (i = 0; i < (unsigned int)(num - 1);)
      {
 #if 0
        Eprintf("App %s: Icon %d-%4d - %dx%d\n",
@@ -640,7 +641,7 @@
 #endif
        i += 2 + val[i] * val[i + 1];
      }
-   if (i != num)
+   if (i != (unsigned int)num)
       Eprintf
         ("*** EWMH_GetWindowIcons Icon data/size mismatch: %s: %d!=%d\n",
          EwinGetName(ewin), i, num);




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to