jscript: Use jsstr_flush in jsval_to_variant.

0eeb5c17 · Jacek Caban · Alexandre Julliard · 721d3ec1 · 0eeb5c17
Commit 0eeb5c17 authored Mar 05, 2013 by Jacek Caban Committed by Alexandre Julliard Mar 05, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

jsutils.c dlls/jscript/jsutils.c +4 -2

No files found.
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -354,8 +354,10 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv)
        if(str->length_flags & JSSTR_FLAG_NULLBSTR) {
            V_BSTR(retv) = NULL;
        }else {
-            V_BSTR(retv) = SysAllocStringLen(str->str, jsstr_length(str));
+            V_BSTR(retv) = SysAllocStringLen(NULL, jsstr_length(str));
-            if(!V_BSTR(retv))
+            if(V_BSTR(retv))
+                jsstr_flush(str, V_BSTR(retv));
+            else
                return E_OUTOFMEMORY;
        }
        return S_OK;