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

src/plugin/PluginDomTraverserBase.h

 /*
  * 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 219 matching lines @@
       CComVariant vRetIndex;
       CComPtr<IDispatch> pFrameDispatch;
 
       if (SUCCEEDED(pFrameCollection->item(vIndex, vRetIndex, &pFrameDispatch)) && pFrameDispatch)
       {
         CComQIPtr<IWebBrowser2> pFrameBrowser = pFrameDispatch;
         if (pFrameBrowser)
         {
           std::wstring src;
           CComBSTR bstrSrc;
-          if (SUCCEEDED(pFrameBrowser->get_LocationURL(&bstrSrc)) && bstrSrc)
+          if (SUCCEEDED(pFrameBrowser->get_LocationURL(&bstrSrc)))
           {
-            src = std::wstring(bstrSrc,SysStringLen(bstrSrc));
+            src = ToWstring(bstrSrc);
           }
           if (!src.empty())
           {
             TraverseDocument(pFrameBrowser, false, indent);
           }
         }
       }
     }
   }
 
@@ skipping 14 matching lines @@
       CComVariant vRetIndex;
       CComPtr<IDispatch> pFrameDispatch;
 
       if (SUCCEEDED(pFrameCollection->item(vIndex, vRetIndex, &pFrameDispatch)) && pFrameDispatch)
       {
         CComQIPtr<IHTMLElement> pFrameEl = pFrameDispatch;
         if (pFrameEl)
         {
           CComVariant vAttr;
 
-          if (SUCCEEDED(pFrameEl->getAttribute(ATL::CComBSTR(L"src"), 0, &vAttr)) && vAttr.vt == VT_BSTR && ::SysStringLen(vAttr.bstrVal) > 0)
+          if (SUCCEEDED(pFrameEl->getAttribute(ATL::CComBSTR(L"src"), 0, &vAttr)) && vAttr.vt == VT_BSTR)
           {
-            std::wstring src(vAttr.bstrVal, SysStringLen(vAttr.bstrVal));
+            std::wstring src = ToWstring(vAttr.bstrVal);
+            if (!src.empty())
+            {
+              // Some times, domain is missing. Should this be added on image src's as well?''
+              // eg. gadgetzone.com.au
+              if (BeginsWith(src, L"//"))
+              {
+                src = L"http:" + src;
+              }
+              // eg. http://w3schools.com/html/html_examples.asp
+              else if (!(BeginsWith(src, L"http") || BeginsWith(src, L"res://")))
+              {
+                src = L"http://" + m_domain + src;
+              }
 
-            // Some times, domain is missing. Should this be added on image src's as well?''
-            // eg. gadgetzone.com.au
-            if (BeginsWith(src, L"//"))
-            {
-              src = L"http:" + src;
-            }
-            // eg. http://w3schools.com/html/html_examples.asp
-            else if (!(BeginsWith(src, L"http") || BeginsWith(src, L"res://")))
-            {
-              src = L"http://" + m_domain + src;
-            }
-
-            // Check if Iframe should be traversed
-            if (OnIFrame(pFrameEl, src, indent))
-            {
-              CComQIPtr<IWebBrowser2> pFrameBrowser = pFrameDispatch;
-              if (pFrameBrowser)
+              // Check if Iframe should be traversed
+              if (OnIFrame(pFrameEl, src, indent))
               {
-                TraverseDocument(pFrameBrowser, false, indent);
+                CComQIPtr<IWebBrowser2> pFrameBrowser = pFrameDispatch;
+                if (pFrameBrowser)
+                {
+                  TraverseDocument(pFrameBrowser, false, indent);
+                }
               }
             }
           }
         }
       }
     }
   }
 }
 
 template <class T>
@@ skipping 144 matching lines @@
   {
     m_cacheIndexLast = 0;
     m_cacheDocumentHasFrames.clear();
     m_cacheDocumentHasIframes.clear();
   }
   m_criticalSection.Unlock();
 }
 
 
 #endif // _PLUGIN_DOM_TRAVERSER_BASE_H_