[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 688e0d2e0d52ba0c2c392829f50a1dea4bd39437
Author: Carlo Bramini <carlo.bramix at libero.it>
Date:   Wed Apr 18 21:51:05 2012 +0200

    shlwapi: Add NULL checks to StrCpyW and StrCatW.
    (cherry picked from commit f6524a9f77cfad6b2d6c7745cdc8598e50e4bdf4)

diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index c65d576..e2f1cba 100644
--- 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;
 }
 

-- 
Debian Wine packaging