From 9e6e12112c10f1809160cb40af4fdf30fb0d160c Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Fri, 20 Apr 2007 07:49:08 -0700 Subject: [PATCH] [perl #42648] [PATCH] crash in win32/VMem.h when out of memory From: "Devin Heitmueller" (via RT) Message-ID: p4raw-id: //depot/perl@31054 --- win32/vmem.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/win32/vmem.h b/win32/vmem.h index 25f2376..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(); -- 2.7.4