[PATCH 0/1] MR1653: msvcrt: Use operator_delete to free _Condition_variable queue nodes.

[Rémi Bernon]

Fwiw, HeapAlloc / HeapFree are used elsewhere in this file, but I don't think they overlap with the _Condition_variable queue nodes.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1653

[PATCH 1/1] msvcrt: Use operator_delete to free _Condition_variable queue nodes.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/msvcrt/concurrency.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c
index f7f7adb86ed..c5db2868d58 100644
--- a/dlls/msvcrt/concurrency.c
+++ b/dlls/msvcrt/concurrency.c
@@ -2656,7 +2656,7 @@ void __thiscall _Condition_variable_dtor(_Condition_variable *this)
         cv_queue *next = this->queue->next;
         if(!this->queue->expired)
             ERR("there's an active wait\n");
-        HeapFree(GetProcessHeap(), 0, this->queue);
+        operator_delete(this->queue);
         this->queue = next;
     }
     critical_section_dtor(&this->lock);
@@ -2753,7 +2753,7 @@ void __thiscall _Condition_variable_notify_one(_Condition_variable *this)
             RtlWakeAddressSingle(&node->next);
             return;
         } else {
-            HeapFree(GetProcessHeap(), 0, node);
+            operator_delete(node);
         }
     }
 }
@@ -2782,7 +2782,7 @@ void __thiscall _Condition_variable_notify_all(_Condition_variable *this)
         if(!InterlockedExchange(&ptr->expired, TRUE))
             RtlWakeAddressSingle(&ptr->next);
         else
-            HeapFree(GetProcessHeap(), 0, ptr);
+            operator_delete(ptr);
         ptr = next;
     }
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1653

[PATCH 0/1] MR1653: msvcrt: Use operator_delete to free _Condition_variable queue nodes. - approved

[Piotr Caban (＠piotr)]

This merge request was approved by Piotr Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1653