Detlef Riekenberg : localui: Avoid crash on NULL pointer.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Apr 24 07:23:57 CDT 2007


Module: wine
Branch: master
Commit: 009b8dd519cdef7bde42262b60579d8509c37ec2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=009b8dd519cdef7bde42262b60579d8509c37ec2

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Tue Apr 24 00:05:47 2007 +0200

localui: Avoid crash on NULL pointer.

---

 dlls/localui/localui.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c
index 36b2812..2fd61c3 100644
--- 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;
 }




More information about the wine-cvs mailing list