Issue #1234 - Convert strings associated with URL's

src/plugin/AdblockPlusDomTraverser.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClient.h"
 #include "PluginFilter.h"
 #include "PluginSettings.h"
 
 #include "AdblockPlusDomTraverser.h"
 
 
 CPluginDomTraverser::CPluginDomTraverser(CPluginTab* tab) : CPluginDomTraverserBase(tab)
@@ skipping 34 matching lines @@
   }
 
   // Images
   if (tag == "img")
   {
     CComVariant vAttr;
 
     if (SUCCEEDED(pEl->getAttribute(L"src", 0, &vAttr)) && vAttr.vt == VT_BSTR && ::SysStringLen(vAttr.bstrVal) > 0)
     {
       std::wstring src(vAttr.bstrVal, SysStringLen(vAttr.bstrVal));
-      SysFreeString(vAttr.bstrVal);

[sergei, 2014/10/17 10:10:12]

It's not necessary to call SysFreeString here because ATL::CComVariant cares
about it.

[Eric, 2014/10/20 02:36:01]

True. Removed it.

[sergei, 2014/10/21 09:45:17]

But it's still here.

[Eric, 2014/10/21 17:19:52]

I _thought_ I had removed it.

It's gone now.

       UnescapeUrl(src);
 
       // If src should be blocked, set style display:none on image
       cache->m_isHidden = client->ShouldBlock(src, CFilter::contentTypeImage, m_domain);
       if (cache->m_isHidden)
       {
         HideElement(pEl, "image", src, true, indent);
         return false;
       }
     }
@@ skipping 36 matching lines @@
         posEnd = posBegin >= 0 ? sObjectHtml.Find(L"\"", posBegin + 7) : -1;
       }
     }
   }
 
   return true;
 }
 
 
 bool CPluginDomTraverser::IsEnabled()
-{ 
+{
   CPluginClient* client = CPluginClient::GetInstance();
-
   return client && CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(m_domain);
 }
 
 
 void CPluginDomTraverser::HideElement(IHTMLElement* pEl, const CString& type, const std::wstring& url, bool isDebug, CString& indent)
 {
   CComPtr<IHTMLStyle> pStyle;
 
   if (SUCCEEDED(pEl->get_style(&pStyle)) && pStyle)
   {
@@ skipping 12 matching lines @@
 
 #ifdef ENABLE_DEBUG_RESULT
         if (isDebug)
         {
           CPluginDebug::DebugResultHiding(type, ToCString(url), "-");
         }
 #endif // ENABLE_DEBUG_RESULT
     }
   }
 }