GetPrinterDriverDirectoryA: do not crash on null pointers.

7a78ca04 · Stefan Leichter · Alexandre Julliard · 242e395b · 7a78ca04
Commit 7a78ca04 authored Jan 08, 2003 by Stefan Leichter Committed by Alexandre Julliard Jan 08, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

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

No files found.
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -2507,10 +2507,11 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
    if (ret) {
        ret = WideCharToMultiByte( CP_ACP, 0, driverDirectoryW, -1, 
                                   pDriverDirectory, cbBuf, NULL, NULL);
-        *pcbNeeded = WideCharToMultiByte( CP_ACP, 0, driverDirectoryW, -1,
-                                   NULL, 0, NULL, NULL);
+        if(pcbNeeded)
+            *pcbNeeded = WideCharToMultiByte( CP_ACP, 0, driverDirectoryW, -1,
+                                              NULL, 0, NULL, NULL);
    } else 
-        *pcbNeeded = pcbNeededW * sizeof(CHAR)/sizeof(WCHAR);
+        if(pcbNeeded) *pcbNeeded = pcbNeededW * sizeof(CHAR)/sizeof(WCHAR);

    TRACE("provided<%ld> required <%ld>\n", cbBuf, *pcbNeeded);