mshtml: Fix leak on failure in return_nsstr.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Fix leak on failure in return_nsstr.
89317f53 · Gabriel Ivăncescu · Alexandre Julliard · 92062771 · 89317f53
Commit 89317f53 authored Jan 07, 2022 by Gabriel Ivăncescu Committed by Alexandre Julliard Jan 24, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

nsembed.c dlls/mshtml/nsembed.c +3 -2

No files found.
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -917,6 +917,7 @@ HRESULT map_nsresult(nsresult nsres)
 HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p)
 {
    const PRUnichar *str;
+    HRESULT hres = S_OK;

    if(NS_FAILED(nsres)) {
        WARN("failed: %08x\n", nsres);
@@ -929,13 +930,13 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p)
    if(*str) {
        *p = SysAllocString(str);
        if(!*p)
-            return E_OUTOFMEMORY;
+            hres = E_OUTOFMEMORY;
    }else {
        *p = NULL;
    }

    nsAString_Finish(nsstr);
-    return S_OK;
+    return hres;
 }

 HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p)