commit 13ae2f5b8c7bf3bd71c8a75250b39d1d77d7cc08
author Francois Jacques <francoisj@macadamian.com> Mon Jul 10 13:04:45 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 10 13:04:45 2000 +0000
tree 65ea8aac57d1c378eff6a3c9f822592cf8776ca9
parent 5c13c2189ef8b16e162785b391e07ec12d24c4ec

Prevent SysAllocString and SysAllocString16 to perform any processing
on NULL strings.

dlls/oleaut32/ole2disp.c

diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c
index ac60851..66917fa 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/dlls/oleaut32/ole2disp.c
@@ -50,7 +50,11 @@
  */
 BSTR16 WINAPI SysAllocString16(LPCOLESTR16 in)
 {
-	BSTR16 out=BSTR_AllocBytes(strlen(in)+1);
+	BSTR16 out;
+    
+	if (!in) return 0;
+    
+	out = BSTR_AllocBytes(strlen(in)+1);
 	if(!out)return 0;
 	strcpy(BSTR_GetAddr(out),in);
 	return out;
@@ -61,6 +65,8 @@
  */
 BSTR WINAPI SysAllocString(LPCOLESTR in)
 {
+    if (!in) return 0;
+    
     /* Delegate this to the SysAllocStringLen32 method. */
     return SysAllocStringLen(in, lstrlenW(in));
 }