advpack: Fix possible NULL pointer access in heap_strdupWtoA.

bafe54e7 · André Hentschel · Alexandre Julliard · ac904762 · bafe54e7
Commit bafe54e7 authored Nov 17, 2012 by André Hentschel Committed by Alexandre Julliard Nov 19, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

advpack_private.h dlls/advpack/advpack_private.h +2 -1

No files found.
--- a/dlls/advpack/advpack_private.h
+++ b/dlls/advpack/advpack_private.h
@@ -44,7 +44,8 @@ static inline char *heap_strdupWtoA(const WCHAR *str)
    if(str) {
        size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL);
        ret = heap_alloc(size);
-        WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL);
+        if(ret)
+            WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL);
    }

    return ret;