system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 07:44:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

urlmon: Don't free structures that are used by asynchronous HttpSendRequest until we are sure they won't be used.

Browse source
This commit is contained in:
Misha Koshelev 2007-07-25 23:58:37 -05:00 committed by Alexandre Julliard
parent 5fe7589bb4
commit a8aa3fb546
1 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
dlls/urlmon/http.c
View file

@ -74,9 +74,11 @@ typedef struct {
const IInternetPriorityVtbl *lpInternetPriorityVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl;
DWORD flags, grfBINDF; DWORD flags, grfBINDF;
BINDINFO bind_info;
IInternetProtocolSink *protocol_sink; IInternetProtocolSink *protocol_sink;
IHttpNegotiate *http_negotiate; IHttpNegotiate *http_negotiate;
HINTERNET internet, connect, request; HINTERNET internet, connect, request;
LPWSTR full_header;
HANDLE lock; HANDLE lock;
ULONG current_position, content_length, available_bytes; ULONG current_position, content_length, available_bytes;
LONG priority; LONG priority;
@ -84,6 +86,10 @@ typedef struct {
LONG ref; LONG ref;
} HttpProtocol; } HttpProtocol;
/* Default headers from native */
static const WCHAR wszHeaders[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',
':',' ','g','z','i','p',',',' ','d','e','f','l','a','t','e',0};
/* /*
* Helpers * Helpers
*/ */
@ -160,6 +166,17 @@ static void HTTPPROTOCOL_Close(HttpProtocol *This)
InternetCloseHandle(This->internet); InternetCloseHandle(This->internet);
This->internet = 0; This->internet = 0;
} }
if (This->full_header)
{
if (This->full_header != wszHeaders)
HeapFree(GetProcessHeap(), 0, This->full_header);
This->full_header = 0;
}
if (This->bind_info.cbSize)
{
ReleaseBindInfo(&This->bind_info);
memset(&This->bind_info, 0, sizeof(This->bind_info));
}
This->flags = 0; This->flags = 0;
} }
@ -284,20 +301,17 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
{ {
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
URL_COMPONENTSW url; URL_COMPONENTSW url;
BINDINFO bindinfo;
DWORD len = 0, request_flags = INTERNET_FLAG_KEEP_CONNECTION; DWORD len = 0, request_flags = INTERNET_FLAG_KEEP_CONNECTION;
ULONG num = 0; ULONG num = 0;
IServiceProvider *service_provider = 0; IServiceProvider *service_provider = 0;
IHttpNegotiate2 *http_negotiate2 = 0; IHttpNegotiate2 *http_negotiate2 = 0;
LPWSTR host = 0, path = 0, user = 0, pass = 0, addl_header = 0, LPWSTR host = 0, path = 0, user = 0, pass = 0, addl_header = 0,
full_header = 0, post_cookie = 0, optional = 0; post_cookie = 0, optional = 0;
BYTE security_id[512]; BYTE security_id[512];
LPOLESTR user_agent, accept_mimes[257]; LPOLESTR user_agent, accept_mimes[257];
HRESULT hres; HRESULT hres;
static const WCHAR wszHttp[] = {'h','t','t','p',':'}; static const WCHAR wszHttp[] = {'h','t','t','p',':'};
static const WCHAR wszHeaders[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',
':',' ','g','z','i','p',',',' ','d','e','f','l','a','t','e',0};
static const WCHAR wszBindVerb[BINDVERB_CUSTOM][5] = static const WCHAR wszBindVerb[BINDVERB_CUSTOM][5] =
{{'G','E','T',0}, {{'G','E','T',0},
{'P','O','S','T',0}, {'P','O','S','T',0},
@ -306,9 +320,9 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved); pOIBindInfo, grfPI, dwReserved);
memset(&bindinfo, 0, sizeof(bindinfo)); memset(&This->bind_info, 0, sizeof(This->bind_info));
bindinfo.cbSize = sizeof(BINDINFO); This->bind_info.cbSize = sizeof(BINDINFO);
hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &This->grfBINDF, &bindinfo); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &This->grfBINDF, &This->bind_info);
if (hres != S_OK) if (hres != S_OK)
{ {
WARN("GetBindInfo failed: %08x\n", hres); WARN("GetBindInfo failed: %08x\n", hres);
@ -407,8 +421,9 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
if (This->grfBINDF & BINDF_NOWRITECACHE) if (This->grfBINDF & BINDF_NOWRITECACHE)
request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; request_flags |= INTERNET_FLAG_NO_CACHE_WRITE;
This->request = HttpOpenRequestW(This->connect, bindinfo.dwBindVerb < BINDVERB_CUSTOM ? This->request = HttpOpenRequestW(This->connect, This->bind_info.dwBindVerb < BINDVERB_CUSTOM ?
wszBindVerb[bindinfo.dwBindVerb] : bindinfo.szCustomVerb, wszBindVerb[This->bind_info.dwBindVerb] :
This->bind_info.szCustomVerb,
path, NULL, NULL, (LPCWSTR *)accept_mimes, path, NULL, NULL, (LPCWSTR *)accept_mimes,
request_flags, (DWORD)This); request_flags, (DWORD)This);
if (!This->request) if (!This->request)
@ -443,20 +458,21 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
} }
else if (addl_header == NULL) else if (addl_header == NULL)
{ {
full_header = (LPWSTR)wszHeaders; This->full_header = (LPWSTR)wszHeaders;
} }
else else
{ {
full_header = HeapAlloc(GetProcessHeap(), 0, int len_addl_header = lstrlenW(addl_header);
(lstrlenW(addl_header)+sizeof(wszHeaders))*sizeof(WCHAR)); This->full_header = HeapAlloc(GetProcessHeap(), 0,
if (!full_header) len_addl_header*sizeof(WCHAR)+sizeof(wszHeaders));
if (!This->full_header)
{ {
WARN("Out of memory\n"); WARN("Out of memory\n");
hres = E_OUTOFMEMORY; hres = E_OUTOFMEMORY;
goto done; goto done;
} }
lstrcpyW(full_header, addl_header); lstrcpyW(This->full_header, addl_header);
lstrcpyW(&full_header[lstrlenW(addl_header)], wszHeaders); lstrcpyW(&This->full_header[len_addl_header], wszHeaders);
} }
hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate2, hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate2,
@ -479,7 +495,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
/* FIXME: Handle security_id. Native calls undocumented function IsHostInProxyBypassList. */ /* FIXME: Handle security_id. Native calls undocumented function IsHostInProxyBypassList. */
if (bindinfo.dwBindVerb == BINDVERB_POST) if (This->bind_info.dwBindVerb == BINDVERB_POST)
{ {
num = 0; num = 0;
hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_POST_COOKIE, &post_cookie, hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_POST_COOKIE, &post_cookie,
@ -493,18 +509,18 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
} }
} }
if (bindinfo.dwBindVerb != BINDVERB_GET) if (This->bind_info.dwBindVerb != BINDVERB_GET)
{ {
/* Native does not use GlobalLock/GlobalUnlock, so we won't either */ /* Native does not use GlobalLock/GlobalUnlock, so we won't either */
if (bindinfo.stgmedData.tymed != TYMED_HGLOBAL) if (This->bind_info.stgmedData.tymed != TYMED_HGLOBAL)
WARN("Expected bindinfo.stgmedData.tymed to be TYMED_HGLOBAL, not %d\n", WARN("Expected This->bind_info.stgmedData.tymed to be TYMED_HGLOBAL, not %d\n",
bindinfo.stgmedData.tymed); This->bind_info.stgmedData.tymed);
else else
optional = (LPWSTR)bindinfo.stgmedData.hGlobal; optional = (LPWSTR)This->bind_info.stgmedData.hGlobal;
} }
if (!HttpSendRequestW(This->request, full_header, lstrlenW(full_header), if (!HttpSendRequestW(This->request, This->full_header, lstrlenW(This->full_header),
optional, optional,
optional ? bindinfo.cbstgmedData : 0) && optional ? This->bind_info.cbstgmedData : 0) &&
GetLastError() != ERROR_IO_PENDING) GetLastError() != ERROR_IO_PENDING)
{ {
WARN("HttpSendRequest failed: %d\n", GetLastError()); WARN("HttpSendRequest failed: %d\n", GetLastError());
@ -521,8 +537,6 @@ done:
} }
CoTaskMemFree(post_cookie); CoTaskMemFree(post_cookie);
if (full_header != wszHeaders)
HeapFree(GetProcessHeap(), 0, full_header);
CoTaskMemFree(addl_header); CoTaskMemFree(addl_header);
if (http_negotiate2) if (http_negotiate2)
IHttpNegotiate2_Release(http_negotiate2); IHttpNegotiate2_Release(http_negotiate2);
@ -539,8 +553,6 @@ done:
HeapFree(GetProcessHeap(), 0, path); HeapFree(GetProcessHeap(), 0, path);
HeapFree(GetProcessHeap(), 0, host); HeapFree(GetProcessHeap(), 0, host);
ReleaseBindInfo(&bindinfo);
return hres; return hres;
} }
@ -904,9 +916,11 @@ HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; ret->lpInternetProtocolVtbl = &HttpProtocolVtbl;
ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; ret->lpInternetPriorityVtbl = &HttpPriorityVtbl;
ret->flags = ret->grfBINDF = 0; ret->flags = ret->grfBINDF = 0;
memset(&ret->bind_info, 0, sizeof(ret->bind_info));
ret->protocol_sink = 0; ret->protocol_sink = 0;
ret->http_negotiate = 0; ret->http_negotiate = 0;
ret->internet = ret->connect = ret->request = 0; ret->internet = ret->connect = ret->request = 0;
ret->full_header = 0;
ret->lock = 0; ret->lock = 0;
ret->current_position = ret->content_length = ret->available_bytes = 0; ret->current_position = ret->content_length = ret->available_bytes = 0;
ret->priority = 0; ret->priority = 0;