BSTRs can be NULL, handle them seperately.

5b63cc22 · Marcus Meissner · Alexandre Julliard · ca30e48f · 5b63cc22
Commit 5b63cc22 authored May 06, 2002 by Marcus Meissner Committed by Alexandre Julliard May 06, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

tmarshal.c dlls/oleaut32/tmarshal.c +10 -3

No files found.
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -369,10 +369,17 @@ marshall_param(
    case VT_NULL:
 	return S_OK;
    case VT_BSTR: {	/* DWORD size, string data */
-	    DWORD *bstr = ((DWORD*)(*arg))-1;

-	    if (relaydeb) MESSAGE("%s",debugstr_w((LPWSTR)(bstr+1)));
-	    return xbuf_add(buf,(LPBYTE)bstr,bstr[0]+4);
+	    if (*arg) {
+		DWORD *bstr = ((DWORD*)(*arg))-1;
+
+		if (relaydeb) MESSAGE("%s",debugstr_w((LPWSTR)(bstr+1)));
+		return xbuf_add(buf,(LPBYTE)bstr,bstr[0]+4);
+	    } else {
+		DWORD xnull = 0;
+
+		return xbuf_add(buf,(LPBYTE)&xnull,sizeof(xnull));
+	    }
 	}
    case VT_BOOL:
    case VT_I4: