shlwapi: Add NULL checks to StrCpyW and StrCatW.

(cherry picked from commit f6524a9f)

shlwapi: Add NULL checks to StrCpyW and StrCatW.
688e0d2e · Carlo Bramini · Alexandre Julliard · a1a9712b · 688e0d2e
Commit 688e0d2e authored Apr 18, 2012 by Carlo Bramini Committed by Alexandre Julliard Jun 15, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

string.c dlls/shlwapi/string.c +4 -2

No files found.
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -477,7 +477,8 @@ LPWSTR WINAPI StrCatW(LPWSTR lpszStr, LPCWSTR lpszSrc)
 {
  TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSrc));

-  strcatW(lpszStr, lpszSrc);
+  if (lpszStr && lpszSrc)
+    strcatW(lpszStr, lpszSrc);
  return lpszStr;
 }

@@ -497,7 +498,8 @@ LPWSTR WINAPI StrCpyW(LPWSTR lpszStr, LPCWSTR lpszSrc)
 {
  TRACE("(%p,%s)\n", lpszStr, debugstr_w(lpszSrc));

-  strcpyW(lpszStr, lpszSrc);
+  if (lpszStr && lpszSrc)
+    strcpyW(lpszStr, lpszSrc);
  return lpszStr;
 }