Changeset 43303 in vbox for trunk/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp

Timestamp:

Sep 11, 2012 11:55:10 PM (12 years ago)

Author:

vboxsync

Message:

Forward ported r78414 from 4.1: Fix VERR_NO_MEMORY loading VMMR0.r0 because of mt.lion executable memory fixes.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp

@@ -395 +395 @@
 extern "C" void OSMalloc(void);
 extern "C" void OSlibkernInit(void);
-extern "C" int  osrelease;
-extern "C" int  ostype;
 extern "C" void kdp_set_interface(void);
 
@@ -743 +741 @@
                     RETURN_VERR_BAD_EXE_FORMAT;
 
-                if (pSeg->vmaddr != 0)
+                if (   pSeg->vmaddr != 0
+                    || !strcmp(pSeg->segname, "__PAGEZERO"))
                 {
                     if (pSeg->vmaddr + RT_ALIGN_Z(pSeg->vmsize, RT_BIT_32(12)) < pSeg->vmaddr)
@@ -775 +774 @@
                         case S_MOD_TERM_FUNC_POINTERS:
                         case S_COALESCED:
+                        case S_4BYTE_LITERALS:
                             if (  pSeg->filesize != 0
                                 ? paSects[i].offset - pSeg->fileoff >= pSeg->filesize
@@ -792 +792 @@
                         case S_SYMBOL_STUBS:
                         case S_INTERPOSING:
-                        case S_4BYTE_LITERALS:
                         case S_8BYTE_LITERALS:
                         case S_16BYTE_LITERALS: