X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fvmem.h;h=460f55793a81e52b759a98b6f096a491c6c99f4a;hb=73e51c8a2e5bd997f8b13e4f86b01e266a2d73f5;hp=3cb10a368c1ce38013b42857bdce873867c52bd6;hpb=45496817146ba03d8f19170832148858221299fd;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/vmem.h b/win32/vmem.h
index 3cb10a3..460f557 100644
--- a/win32/vmem.h
+++ b/win32/vmem.h
@@ -164,6 +164,10 @@ void* VMem::Malloc(size_t size)
 #ifdef _USE_LINKED_LIST
     GetLock();
     PMEMORY_BLOCK_HEADER ptr = (PMEMORY_BLOCK_HEADER)m_pmalloc(size+sizeof(MEMORY_BLOCK_HEADER));
+    if (!ptr) {
+	FreeLock();
+	return NULL;
+    }
     LinkBlock(ptr);
     FreeLock();
     return (ptr+1);
@@ -187,6 +191,10 @@ void* VMem::Realloc(void* pMem, size_t size)
     PMEMORY_BLOCK_HEADER ptr = (PMEMORY_BLOCK_HEADER)(((char*)pMem)-sizeof(MEMORY_BLOCK_HEADER));
     UnlinkBlock(ptr);
     ptr = (PMEMORY_BLOCK_HEADER)m_prealloc(ptr, size+sizeof(MEMORY_BLOCK_HEADER));
+    if (!ptr) {
+	FreeLock();
+	return NULL;
+    }
     LinkBlock(ptr);
     FreeLock();
 
@@ -207,7 +215,8 @@ void VMem::Free(void* pMem)
 		dTHX;
 	    	int *nowhere = NULL;
 	    	Perl_warn(aTHX_ "Free to wrong pool %p not %p",this,ptr->owner);
-            	*nowhere = 0;
+            	*nowhere = 0; /* this segfault is deliberate, 
+            	                 so you can see the stack trace */
 #else
                 ptr->owner->Free(pMem);	
 #endif