commit acefd16beeb8658cc972db7a584236af8c185aea
author Ulrich Weigand <weigand@immd1.informatik.uni-erlangen.de> Fri Dec 29 05:09:15 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 29 05:09:15 2000 +0000
tree d9b8f488c63b77fd6f0b8fec005a0c6aee0f7be3
parent e709cdbae31228c8e5d275b36d3710d959ca2c1a

Prevent unaligned access to NE in-memory module data.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index b687ea6..a50b5bd 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -356,7 +356,7 @@
                     + strlen(filename) + 1;
     size = sizeof(NE_MODULE) +
                  /* loaded file info */
-                 of_size +
+                 ((of_size + 3) & ~3) + 
                  /* segment table: DS,CS */
                  2 * sizeof(SEGTABLEENTRY) +
                  /* name table */
@@ -405,7 +405,7 @@
     ofs->cBytes = of_size < 256 ? of_size : 255;   /* FIXME */
     strcpy( ofs->szPathName, filename );
 
-    pSegment = (SEGTABLEENTRY*)((char*)(pModule + 1) + of_size);
+    pSegment = (SEGTABLEENTRY*)((char*)(pModule + 1) + ((of_size + 3) & ~3));
     pModule->seg_table = (int)pSegment - (int)pModule;
     /* Data segment */
     pSegment->size    = 0;