From fc3136e93d247301a9f3dbb03d294ba22d4f7b26 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Wed, 2 Jul 2008 10:00:12 +0000 Subject: [PATCH] - Prevent crashes when heapPtr is NULL, also fix broken heap magic output. Thanks Mephisto! svn path=/trunk/; revision=34256 --- reactos/lib/rtl/heap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/reactos/lib/rtl/heap.c b/reactos/lib/rtl/heap.c index 2e9e832e5d5..8ffe604f648 100644 --- a/reactos/lib/rtl/heap.c +++ b/reactos/lib/rtl/heap.c @@ -335,7 +335,10 @@ static HEAP *HEAP_GetPtr( HEAP *heapPtr = (HEAP *)heap; if (!heapPtr || (heapPtr->magic != HEAP_MAGIC)) { - ERR("Invalid heap %p, magic:%4s!\n", heap,heapPtr->magic ); + if (heapPtr) + ERR("Invalid heap %p, magic:%.4s!\n", heap, &heapPtr->magic ); + else + ERR("Invalid heap %p!\n", heap ); //KeDumpStackFrames(NULL); return NULL; }