ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml3: Correctly handle VT_NULL in IXMLHTTPRequest::send.

Browse Source
This commit is contained in:
Jacek Caban 2013-05-10 14:21:41 +02:00 committed by Alexandre Julliard
parent fdc4d40d18
commit 2dd4e497d6
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/msxml3/httprequest.c
View File

@ -736,27 +736,31 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback *
/* fall through */ /* fall through */
case VT_EMPTY: case VT_EMPTY:
case VT_ERROR: case VT_ERROR:
case VT_NULL:
ptr = NULL; ptr = NULL;
size = 0; size = 0;
break; break;
} }
bsc->body = GlobalAlloc(GMEM_FIXED, size); if (size)
if (!bsc->body)
{ {
if (V_VT(body) == VT_BSTR) bsc->body = GlobalAlloc(GMEM_FIXED, size);
heap_free(ptr); if (!bsc->body)
else if (V_VT(body) == (VT_ARRAY|VT_UI1)) {
SafeArrayUnaccessData(sa); if (V_VT(body) == VT_BSTR)
heap_free(ptr);
else if (V_VT(body) == (VT_ARRAY|VT_UI1))
SafeArrayUnaccessData(sa);
heap_free(bsc); heap_free(bsc);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
}
send_data = GlobalLock(bsc->body);
memcpy(send_data, ptr, size);
GlobalUnlock(bsc->body);
} }
send_data = GlobalLock(bsc->body);
memcpy(send_data, ptr, size);
GlobalUnlock(bsc->body);
if (V_VT(body) == VT_BSTR) if (V_VT(body) == VT_BSTR)
heap_free(ptr); heap_free(ptr);
else if (V_VT(body) == (VT_ARRAY|VT_UI1)) else if (V_VT(body) == (VT_ARRAY|VT_UI1))