GlobalReAlloc returns 0 on failure.

c43fdb75 · Huw D M Davies · Alexandre Julliard · e529d360 · c43fdb75
Commit c43fdb75 authored Apr 13, 2000 by Huw D M Davies Committed by Alexandre Julliard Apr 13, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

global.c memory/global.c +7 -4

No files found.
--- a/memory/global.c
+++ b/memory/global.c
@@ -1251,14 +1251,17 @@ HGLOBAL WINAPI GlobalReAlloc(
 	    hnew=hmem;
 	    if(pintern->Pointer)
 	    {
-	       palloc=HeapReAlloc(heap, heap_flags,
-				  (char *) pintern->Pointer-sizeof(HGLOBAL),
-				  size+sizeof(HGLOBAL) );
+	       if((palloc = HeapReAlloc(heap, heap_flags,
+				   (char *) pintern->Pointer-sizeof(HGLOBAL),
+				   size+sizeof(HGLOBAL))) == NULL)
+		   return 0; /* Block still valid */
 	       pintern->Pointer=(char *) palloc+sizeof(HGLOBAL);
 	    }
 	    else
 	    {
-	       palloc=HeapAlloc(heap, heap_flags, size+sizeof(HGLOBAL));
+	        if((palloc=HeapAlloc(heap, heap_flags, size+sizeof(HGLOBAL)))
+		   == NULL)
+		    return 0;
 	       *(HGLOBAL *)palloc=hmem;
 	       pintern->Pointer=(char *) palloc+sizeof(HGLOBAL);
 	    }