[PATCH v4 4/9] mshtml: Fix URI leak in NewURI on failure.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/nsio.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index d60b2f0fa81..5bd07334566 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -3892,8 +3892,11 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC

len = MultiByteToWideChar(CP_UTF8, 0, aOriginCharset, -1, NULL, 0);
         charset = SysAllocStringLen(NULL, len-1);
-        if(!charset)
+        if(!charset) {
+            if(base_wine_uri)
+                nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);
             return NS_ERROR_OUT_OF_MEMORY;
+        }
         MultiByteToWideChar(CP_UTF8, 0, aOriginCharset, -1, charset, len);

cp = cp_from_charset_string(charset);
@@ -3905,6 +3908,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC

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 +3920,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;