mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and…

mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling.

mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and…
8192f549 · Zhenbo Li · Alexandre Julliard · 4f0d36d9 · 8192f549
Commit 8192f549 authored May 03, 2014 by Zhenbo Li Committed by Alexandre Julliard May 05, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

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

No files found.
--- a/dlls/mshtml/htmltablerow.c
+++ b/dlls/mshtml/htmltablerow.c
@@ -175,8 +175,9 @@ static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v)

    TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    nsAString_InitDepend(&val, V_BSTR(&v));
-    variant_to_nscolor(&v, &val);
+    if (!variant_to_nscolor(&v, &val))
+        return S_OK;
+
    nsres = nsIDOMHTMLTableRowElement_SetBgColor(This->nsrow, &val);
    nsAString_Finish(&val);