[PATCH 0/1] MR7420: comctl32: Fix Alloc/HeapAlloc mismatches.

[PATCH 1/1] comctl32: Fix Alloc/HeapAlloc mismatches.

[Haoyang Chen]

From: Haoyang Chen

---
 dlls/comctl32/dpa.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c
index aa9a045e516..22a3f8c451d 100644
--- a/dlls/comctl32/dpa.c
+++ b/dlls/comctl32/dpa.c
@@ -910,14 +910,12 @@ HDPA WINAPI DPA_CreateEx (INT nGrow, HANDLE hHeap)

TRACE("(%d %p)\n", nGrow, hHeap);

-    if (hHeap)
-        hdpa = HeapAlloc (hHeap, HEAP_ZERO_MEMORY, sizeof(*hdpa));
-    else
-        hdpa = Alloc (sizeof(*hdpa));
+    if (!hHeap) hHeap = GetProcessHeap();
+    hdpa = HeapAlloc (hHeap, HEAP_ZERO_MEMORY, sizeof(*hdpa));

if (hdpa) {
         hdpa->nGrow = max(8, nGrow);
-        hdpa->hHeap = hHeap ? hHeap : GetProcessHeap();
+        hdpa->hHeap = hHeap;
         hdpa->nMaxCount = hdpa->nGrow * 2;
         hdpa->ptrs = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
                                 hdpa->nMaxCount * sizeof(LPVOID));

[PATCH 0/1] MR7420: comctl32: Fix Alloc/HeapAlloc mismatches. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.