[PATCH 0/1] MR1350: comctl32: Fix memory leak on error path in EDIT_MakeUndoFit.

[PATCH 1/1] comctl32: Fix memory leak on error path in EDIT_MakeUndoFit.

[Alex Henrie]

From: Alex Henrie

---
 dlls/comctl32/edit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c
index a9a469ffd47..96ed2b0ae1b 100644
--- a/dlls/comctl32/edit.c
+++ b/dlls/comctl32/edit.c
@@ -1292,6 +1292,7 @@ static BOOL EDIT_MakeFit(EDITSTATE *es, UINT size)
 static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size)
 {
    UINT alloc_size;
+	WCHAR *new_undo_text;

if (size <= es->undo_buffer_size)
    	return TRUE;
@@ -1299,7 +1300,8 @@ static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size)
    TRACE("trying to ReAlloc to %d+1\n", size);

alloc_size = ROUND_TO_GROW((size + 1) * sizeof(WCHAR));
-	if ((es->undo_text = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, es->undo_text, alloc_size))) {
+	if ((new_undo_text = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, es->undo_text, alloc_size))) {
+		es->undo_text = new_undo_text;
    	es->undo_buffer_size = alloc_size/sizeof(WCHAR) - 1;
    	return TRUE;
    }

[PATCH 1/1] comctl32: Fix memory leak on error path in EDIT_MakeUndoFit.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=126126

Your paranoid android.

=== debian11 (32 bit report) ===

crypt32:
cert.c:4191: Test failed: success
cert.c:4192: Test failed: got 00000000
cert.c:4193: Test failed: got 00000000

wmvcore:
wmvcore.c:1617: Test failed: Stream 0: Format 3: Got hr 0x8007000e.
Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00410d09).

[PATCH 0/1] MR1350: comctl32: Fix memory leak on error path in EDIT_MakeUndoFit. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.