[Dotgnu-pnet-commits] pnet/resgen resgen_binary.c,1.2,1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/resgen
In directory subversions:/tmp/cvs-serv10794/resgen

Modified Files:
        resgen_binary.c 
Log Message:


Resource sections should be padded to a multiple of 4 bytes.


Index: resgen_binary.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/resgen/resgen_binary.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** resgen_binary.c     8 Jan 2002 23:20:10 -0000       1.2
--- resgen_binary.c     14 Nov 2003 21:39:15 -0000      1.3
***************
*** 378,381 ****
--- 378,382 ----
        unsigned long len;
        unsigned long magic;
+       unsigned long pad;
        while(size >= 8)
        {
***************
*** 391,400 ****
                size -= 8;
                len -= 4;
  
                /* Skip if not string resources */
                if(magic != (unsigned long)0xBEEFCACE)
                {
!                       address += len;
!                       size -= len;
                        continue;
                }
--- 392,409 ----
                size -= 8;
                len -= 4;
+               if((len % 4) != 0)
+               {
+                       pad = 4 - (len % 4);
+               }
+               else
+               {
+                       pad = 0;
+               }
  
                /* Skip if not string resources */
                if(magic != (unsigned long)0xBEEFCACE)
                {
!                       address += len + pad;
!                       size -= len + pad;
                        continue;
                }
***************
*** 405,410 ****
                        return 1;
                }
!               address += len;
!               size -= len;
        }
        return 0;
--- 414,419 ----
                        return 1;
                }
!               address += len + pad;
!               size -= len + pad;
        }
        return 0;