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

urlmon: Fix MK protocol handling of escaped characters.

Browse source
This commit is contained in:
Erich Hoover 2011-01-11 12:04:25 -07:00 committed by Alexandre Julliard
parent 1678a4a673
commit aaa9fa7112
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/urlmon/mk.c
View file

@ -205,8 +205,8 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
LPWSTR mime, progid, display_name, colon_ptr;
DWORD path_size = INTERNET_MAX_URL_LENGTH;
DWORD bindf=0, eaten=0, scheme=0, len;
BSTR url, path_tmp, path = NULL;
IParseDisplayName *pdn;
BSTR url, path = NULL;
BINDINFO bindinfo;
STATSTG statstg;
IMoniker *mon;
@ -244,14 +244,22 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
CoTaskMemFree(mime);
}
hres = IUri_GetPath(pUri, &path);
hres = IUri_GetPath(pUri, &path_tmp);
if(FAILED(hres))
return hres;
path = heap_alloc(path_size);
hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0);
SysFreeString(path_tmp);
if (FAILED(hres))
{
heap_free(path);
return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER);
}
progid = path+1; /* skip '@' symbol */
colon_ptr = strchrW(path, ':');
if(!colon_ptr)
{
SysFreeString(path);
heap_free(path);
return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER);
}
@ -261,7 +269,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */
hres = CLSIDFromProgID(progid, &clsid);
SysFreeString(path);
heap_free(path);
if(FAILED(hres))
{
heap_free(display_name);