Fixed some OOM conditions in GlobalAlloc.

3bcfb901 · Eric Pouech · Alexandre Julliard · e384fa6b · 3bcfb901
Commit 3bcfb901 authored Jun 24, 2000 by Eric Pouech Committed by Alexandre Julliard Jun 24, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

global.c memory/global.c +5 -1

No files found.
--- a/memory/global.c
+++ b/memory/global.c
@@ -1039,9 +1039,13 @@ HGLOBAL WINAPI GlobalAlloc(
      /* HeapLock(heap); */

      pintern=HeapAlloc(heap, 0,  sizeof(GLOBAL32_INTERN));
+      if (!pintern) return NULL;
      if(size)
      {
-	 palloc=HeapAlloc(heap, hpflags, size+sizeof(HGLOBAL));
+	 if (!(palloc=HeapAlloc(heap, hpflags, size+sizeof(HGLOBAL)))) {
+	    HeapFree(heap, 0, pintern);
+	    return NULL;
+	 }
 	 *(HGLOBAL *)palloc=INTERN_TO_HANDLE(pintern);
 	 pintern->Pointer=(char *) palloc+sizeof(HGLOBAL);
      }