[PATCH 0/1] MR1587: wineps: Fix memory leaks on error paths in DrvDocumentPropertySheets (cppcheck).

[PATCH 1/1] wineps: Fix memory leaks on error paths in DrvDocumentPropertySheets (cppcheck).

[Alex Henrie]

From: Alex Henrie

---
 dlls/wineps.drv/driver.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index 540d6bed656..ed4db39ce74 100644
--- a/dlls/wineps.drv/driver.c
+++ b/dlls/wineps.drv/driver.c
@@ -494,7 +494,10 @@ LONG WINAPI DrvDocumentPropertySheets(PROPSHEETUI_INFO *info, LPARAM lparam)

di->dlgdm = malloc(sizeof(*di->dlgdm));
             if (!di->dlgdm)
+            {
+                free(di);
                 return ERR_CPSUI_ALLOCMEM_FAILED;
+            }

memset(&psp, 0, sizeof(psp));
             di->pi = pi;
@@ -507,7 +510,11 @@ LONG WINAPI DrvDocumentPropertySheets(PROPSHEETUI_INFO *info, LPARAM lparam)
             psp.lParam = (LPARAM)di;

if (!info->pfnComPropSheet(info->hComPropSheet, CPSFUNC_ADD_PROPSHEETPAGEW, (LPARAM)&psp, 0))
+            {
+                free(di->dlgdm);
+                free(di);
                 return ERR_CPSUI_GETLASTERROR;
+            }
         }
     }

[Piotr Caban (＠piotr)]

These are not leaks. The memory will be freed in PROPSHEETUI_REASON_DESTROY callback that is called even if PROPSHEETUI_REASON_INIT fails.

[Alex Henrie (＠alexhenrie)]

On Tue Nov 29 14:29:39 2022 +0000, Piotr Caban wrote:
> These are not leaks. The memory will be freed in
> PROPSHEETUI_REASON_DESTROY callback that is called even if
> PROPSHEETUI_REASON_INIT fails.

Ah, that makes sense. Thanks for the clarification.

[PATCH 0/1] MR1587: wineps: Fix memory leaks on error paths in DrvDocumentPropertySheets (cppcheck). - closed

[Alex Henrie (＠alexhenrie)]

This merge request was closed by Alex Henrie.