localui: Avoid crash on NULL pointer.

009b8dd5 · Detlef Riekenberg · Alexandre Julliard · 7aa1b2e4 · 009b8dd5
Commit 009b8dd5 authored Apr 24, 2007 by Detlef Riekenberg Committed by Alexandre Julliard Apr 24, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

localui.c dlls/localui/localui.c +2 -2

No files found.
--- a/dlls/localui/localui.c
+++ b/dlls/localui/localui.c
@@ -50,11 +50,11 @@ static LPWSTR strdupWW(LPCWSTR pPrefix, LPCWSTR pSuffix)
    LPWSTR  ptr;
    DWORD   len;

-    len = lstrlenW(pPrefix) + lstrlenW(pSuffix) + 1;
+    len = lstrlenW(pPrefix) + (pSuffix ? lstrlenW(pSuffix) : 0) + 1;
    ptr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
    if (ptr) {
        lstrcpyW(ptr, pPrefix);
-        lstrcatW(ptr, pSuffix);
+        if (pSuffix) lstrcatW(ptr, pSuffix);
    }
    return ptr;
 }