commit cc195924a66b5c79f7b8521b4dc26d41cbe33349
author Ulrich Weigand <weigand@immd1.informatik.uni-erlangen.de> Wed Dec 27 04:18:26 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Dec 27 04:18:26 2000 +0000
tree b7596733e5f1c5f6e34e287f340699b4f8e98266
parent a6d83ebae1790ba43a6dc307915edf57e50de5e3

Added check whether unaligned memory access is allowed.
Added macros to access unaligned WORDs / DWORDs.

memory/environ.c

diff --git a/memory/environ.c b/memory/environ.c
index 6630137..e7bf71c 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "wine/port.h"
 #include "windef.h"
 #include "winnls.h"
 #include "winerror.h"
@@ -59,7 +60,7 @@
 /* Fill the extra bytes with the program name and stuff */
 #define FILL_EXTRA_ENV(p) \
     *(p) = '\0'; \
-    PUT_WORD( (p) + 1, 1 ); \
+    PUT_UA_WORD( (p) + 1, 1 ); \
     strcpy( (p) + 3, ENV_program_name );
 
 STARTUPINFOA current_startupinfo =

memory/heap.c

diff --git a/memory/heap.c b/memory/heap.c
index 0437a0c..c73d52a 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "config.h"
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
 #include "selectors.h"
@@ -682,6 +683,16 @@
 {
     char *heapEnd = (char *)subheap + subheap->size;
 
+#if !defined(ALLOW_UNALIGNED_ACCESS)
+    /* Check for unaligned pointers */
+    if ( (long)pArena % sizeof(void *) != 0 )
+    {
+        ERR( "Heap %08lx: unaligned arena pointer %08lx\n",
+             (DWORD)subheap->heap, (DWORD)pArena );
+        return FALSE;
+    }
+#endif
+
     /* Check magic number */
     if (pArena->magic != ARENA_FREE_MAGIC)
     {
@@ -766,6 +777,28 @@
 {
     char *heapEnd = (char *)subheap + subheap->size;
 
+#if !defined(ALLOW_UNALIGNED_ACCESS)
+    /* Check for unaligned pointers */
+    if ( (long)pArena % sizeof(void *) != 0 )
+    {
+        if ( quiet == NOISY )
+        {
+            ERR( "Heap %08lx: unaligned arena pointer %08lx\n",
+                  (DWORD)subheap->heap, (DWORD)pArena );
+            if ( TRACE_ON(heap) )
+                HEAP_Dump( subheap->heap );
+        }
+        else if ( WARN_ON(heap) )
+        {
+            WARN( "Heap %08lx: unaligned arena pointer %08lx\n",
+                  (DWORD)subheap->heap, (DWORD)pArena );
+            if ( TRACE_ON(heap) )
+                HEAP_Dump( subheap->heap );
+        }
+        return FALSE;
+    }
+#endif
+
     /* Check magic number */
     if (pArena->magic != ARENA_INUSE_MAGIC)
     {