Fix for bug 4051 -- with large memory allocation, quit on launch. Was a numeric overflow in the memory manager initialization.

lib/mac/MacMemoryAllocator/src/nsAllocatorManager.cp

@@ -162,7 +162,7 @@ void nsHeapZoneHeader::DisposeZonePtr(Ptr thePtr, Boolean &outWasLastChunk)
 
 const SInt32	nsAllocatorManager::kNumMasterPointerBlocks = 30;
 const SInt32	nsAllocatorManager::kApplicationStackSizeIncrease = (32 * 1024);
-const SInt32	nsAllocatorManager::kHeapZoneHeapPercentage = 60;
+const float 	nsAllocatorManager::kHeapZoneHeapPercentage = 0.6;
 const SInt32	nsAllocatorManager::kSmallHeapByteRange = 16;
 
 nsAllocatorManager* 	nsAllocatorManager::sAllocatorManager = nil;
@@ -216,7 +216,7 @@ nsAllocatorManager::nsAllocatorManager()
 	// make the heap zone for our subheaps
 	UInt32		heapZoneSize;
 	
-	heapZoneSize = ( kHeapZoneHeapPercentage * ::FreeMem() ) / 100;
+	heapZoneSize = (UInt32)(kHeapZoneHeapPercentage * ::FreeMem());
 	heapZoneSize = ( ( heapZoneSize + 3 ) & ~3 );		// round up to a multiple of 4 bytes
 
 	nsHeapZoneHeader	*firstZone = MakeNewHeapZone(heapZoneSize, heapZoneSize);
@@ -445,8 +445,12 @@ void nsAllocatorManager::FreeSubheap(Ptr subheapPtr)
 	if (sAllocatorManager) return sAllocatorManager;
 	
 	if (InitializeMacMemory(kNumMasterPointerBlocks, kApplicationStackSizeIncrease) != noErr)
+	{
+#ifdef DEBUG
+		::DebugStr("\pAllocator Manager initialization failed");
+#endif
 		::ExitToShell();
-	
+	}
 	return sAllocatorManager;
 }
 

lib/mac/MacMemoryAllocator/src/nsAllocatorManager.h

@@ -98,7 +98,7 @@ class nsAllocatorManager
 		static const SInt32			kNumMasterPointerBlocks;
 		static const SInt32			kApplicationStackSizeIncrease;
 		
-		static const SInt32			kHeapZoneHeapPercentage;
+		static const float			kHeapZoneHeapPercentage;
 		static const SInt32			kTempMemHeapZoneSize;
 		static const SInt32			kTempMemHeapMinZoneSize;