winspool: Fix potential string buffer leaks (Coverity).

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winspool: Fix potential string buffer leaks (Coverity).
614ad0c8 · Nikolay Sivov · Alexandre Julliard · a3aad9d8 · 614ad0c8
Commit 614ad0c8 authored Dec 22, 2016 by Nikolay Sivov Committed by Alexandre Julliard Dec 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

info.c dlls/winspool.drv/info.c +4 -3

No files found.
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -8565,17 +8565,17 @@ LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc )
    if (doc->lpszDocName)
    {
        docnameW = asciitounicode(&usBuffer, doc->lpszDocName);
-        if (!(docW.lpszDocName = docnameW)) return NULL;
+        if (!(docW.lpszDocName = docnameW)) goto failed;
    }
    if (doc->lpszOutput)
    {
        outputW = asciitounicode(&usBuffer, doc->lpszOutput);
-        if (!(docW.lpszOutput = outputW)) return NULL;
+        if (!(docW.lpszOutput = outputW)) goto failed;
    }
    if (doc->lpszDatatype)
    {
        datatypeW = asciitounicode(&usBuffer, doc->lpszDatatype);
-        if (!(docW.lpszDatatype = datatypeW)) return NULL;
+        if (!(docW.lpszDatatype = datatypeW)) goto failed;
    }
    docW.fwType = doc->fwType;

@@ -8589,6 +8589,7 @@ LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc )
        HeapFree(GetProcessHeap(), 0, retW);
    }

+failed:
    HeapFree(GetProcessHeap(), 0, datatypeW);
    HeapFree(GetProcessHeap(), 0, outputW);
    HeapFree(GetProcessHeap(), 0, docnameW);