Do not rely on HeapReAlloc to allocate a NULL pointer.

6168b981 · Dimitrie O. Paun · Alexandre Julliard · 7888385d · 6168b981
Commit 6168b981 authored Oct 21, 2002 by Dimitrie O. Paun Committed by Alexandre Julliard Oct 21, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

comctl32undoc.c dlls/comctl32/comctl32undoc.c +5 -2

No files found.
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -1923,8 +1923,11 @@ DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p)
 		hdpa->nGrow * ((INT)(((i+1) - 1) / hdpa->nGrow) + 1);
 	    INT nSize = nNewItems * sizeof(LPVOID);

-	    lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-					   hdpa->ptrs, nSize);
+	    if (hdpa->ptrs)
+	        lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, nSize);
+	    else
+		lpTemp = (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, nSize);
+	    
 	    if (!lpTemp)
 		return FALSE;