Jacek Caban : mshtml: Removed invalid nsAString_InitDepend from HTMLTable_put_bgColor and fixed error handling.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c49bb259505d2b1c52ce671bbb2fe4e82545777e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c49bb259505d2b1c52ce671bbb...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Mon Apr 28 12:40:08 2014 +0200

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

---

 dlls/mshtml/htmltable.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c
index d711ed7..08a0bf0 100644
--- a/dlls/mshtml/htmltable.c
+++ b/dlls/mshtml/htmltable.c
@@ -251,11 +251,11 @@ static HRESULT WINAPI HTMLTable_put_bgColor(IHTMLTable *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 = nsIDOMHTMLTableElement_SetBgColor(This->nstable, &val);
     nsAString_Finish(&val);
-
     if (NS_FAILED(nsres)){
         ERR("Set BgColor(%s) failed!\n", debugstr_variant(&v));
         return E_FAIL;