Issue #3562 - Use 'ToWstring()' to convert BSTR values

src/plugin/AdblockPlusDomTraverser.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 47 matching lines @@
   if (cache->m_isHidden)
   {
     HideElement(pEl, tag, L"", false, indent);
     return false;
   }
 
   // Images
   if (tag == L"img")
   {
     CComVariant vAttr;
-
-    if (SUCCEEDED(pEl->getAttribute(ATL::CComBSTR(L"src"), 0, &vAttr)) && vAttr.vt == VT_BSTR && ::SysStringLen(vAttr.bstrVal) > 0)
+    if (SUCCEEDED(pEl->getAttribute(ATL::CComBSTR(L"src"), 0, &vAttr)) && vAttr.vt == VT_BSTR)
     {
-      std::wstring src(vAttr.bstrVal, SysStringLen(vAttr.bstrVal));
-
-      // If src should be blocked, set style display:none on image
-      cache->m_isHidden = client->ShouldBlock(src,
-        AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_IMAGE, m_documentUrl);
-      if (cache->m_isHidden)
+      std::wstring src = ToWstring(vAttr.bstrVal);
+      if (!src.empty())
       {
-        HideElement(pEl, L"image", src, true, indent);
-        return false;
+        // If src should be blocked, set style display:none on image
+        cache->m_isHidden = client->ShouldBlock(src,
+          AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_IMAGE, m_documentUrl);
+        if (cache->m_isHidden)
+        {
+          HideElement(pEl, L"image", src, true, indent);
+          return false;
+        }
       }
     }
   }
   // Objects
   else if (tag == L"object")
   {
     CComBSTR bstrInnerHtml;
     if (SUCCEEDED(pEl->get_innerHTML(&bstrInnerHtml)) && bstrInnerHtml)
     {
       const std::wstring objectInnerHtml(ToWstring(bstrInnerHtml));
@@ skipping 41 matching lines @@
 }
 
 
 void CPluginDomTraverser::HideElement(IHTMLElement* pEl, const std::wstring& type, const std::wstring& url, bool isDebug, const std::wstring& indent)
 {
   CComPtr<IHTMLStyle> pStyle;
 
   if (SUCCEEDED(pEl->get_style(&pStyle)) && pStyle)
   {
     CComBSTR bstrDisplay;
-    if (SUCCEEDED(pStyle->get_display(&bstrDisplay)) && bstrDisplay && ToWstring(bstrDisplay) == L"none")
+    if (SUCCEEDED(pStyle->get_display(&bstrDisplay)) && ToWstring(bstrDisplay) == L"none")
     {
       return;
     }
-
     static const CComBSTR sbstrNone(L"none");
-
     if (SUCCEEDED(pStyle->put_display(sbstrNone)))
     {
       DEBUG_HIDE_EL(ToWstring(indent) + L"HideEl::Hiding " + ToWstring(type) + L" url:" + url)
-
 #ifdef ENABLE_DEBUG_RESULT
         if (isDebug)
         {
           CPluginDebug::DebugResultHiding(type, url, L"-");
         }
 #endif // ENABLE_DEBUG_RESULT
     }
   }
 }