Commit 2cefbaab authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard

winspool: Avoid memory leaks (coverity).

parent 5108b189
...@@ -944,7 +944,11 @@ static BOOL CUPS_LoadPrinters(void) ...@@ -944,7 +944,11 @@ static BOOL CUPS_LoadPrinters(void)
unlink_ppd( ppd ); unlink_ppd( ppd );
} }
HeapFree( GetProcessHeap(), 0, ppd ); HeapFree( GetProcessHeap(), 0, ppd );
if (!added_driver) continue; if (!added_driver)
{
HeapFree( GetProcessHeap(), 0, port );
continue;
}
memset(&pi2, 0, sizeof(PRINTER_INFO_2W)); memset(&pi2, 0, sizeof(PRINTER_INFO_2W));
pi2.pPrinterName = nameW; pi2.pPrinterName = nameW;
...@@ -2374,7 +2378,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, ...@@ -2374,7 +2378,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
{ {
LPSTR pDeviceNameA = strdupWtoA(pDeviceName); LPSTR pDeviceNameA = strdupWtoA(pDeviceName);
LPDEVMODEA pDevModeInputA = DEVMODEdupWtoA(pDevModeInput); LPDEVMODEA pDevModeInputA;
LPDEVMODEA pDevModeOutputA = NULL; LPDEVMODEA pDevModeOutputA = NULL;
LONG ret; LONG ret;
...@@ -2386,6 +2390,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, ...@@ -2386,6 +2390,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
if(ret < 0) return ret; if(ret < 0) return ret;
pDevModeOutputA = HeapAlloc(GetProcessHeap(), 0, ret); pDevModeOutputA = HeapAlloc(GetProcessHeap(), 0, ret);
} }
pDevModeInputA = DEVMODEdupWtoA(pDevModeInput);
ret = DocumentPropertiesA(hWnd, hPrinter, pDeviceNameA, pDevModeOutputA, ret = DocumentPropertiesA(hWnd, hPrinter, pDeviceNameA, pDevModeOutputA,
pDevModeInputA, fMode); pDevModeInputA, fMode);
if(pDevModeOutput) { if(pDevModeOutput) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment