system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 17:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mshtml: Fix URI leak in NewURI on failure.

Browse source 
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
This commit is contained in:
Gabriel Ivăncescu 2023-04-25 20:29:25 +03:00 committed by Alexandre Julliard
parent a10acc0ac3
commit 1544be253a
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dlls/mshtml/nsio.c
View file

@ -3876,16 +3876,6 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC
if(!strncmp(spec, "wine:", 5))
spec += 5;
if(aBaseURI) {
nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri);
if(NS_SUCCEEDED(nsres)) {
if(!ensure_uri(base_wine_uri))
return NS_ERROR_UNEXPECTED;
}else {
WARN("Could not get base nsWineURI: %08lx\n", nsres);
}
}
if(aOriginCharset && *aOriginCharset && _strnicmp(aOriginCharset, "utf", 3)) {
BSTR charset;
int len;
@ -3903,8 +3893,21 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC
MultiByteToWideChar(cp, 0, spec, -1, new_spec, ARRAY_SIZE(new_spec));
if(aBaseURI) {
nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri);
if(NS_SUCCEEDED(nsres)) {
if(!ensure_uri(base_wine_uri)) {
nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);
return NS_ERROR_UNEXPECTED;
}
}else {
WARN("Could not get base nsWineURI: %08lx\n", nsres);
}
}
if(base_wine_uri) {
hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri);
nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);
}else {
hres = create_uri(new_spec, 0, &urlmon_uri);
if(FAILED(hres))
@ -3916,8 +3919,6 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC
nsres = create_nsuri(urlmon_uri, &wine_uri);
IUri_Release(urlmon_uri);
if(base_wine_uri)
nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);
if(NS_FAILED(nsres))
return nsres;