Issue 3303 - Unescape request URL for ShouldBlock in WBPassthruSink::BeginningTransaction

src/plugin/PluginWbPassThrough.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 360 matching lines @@
   if (IsFlashRequest(pszAdditionalHeaders))
   {
     m_contentType = ContentType::CONTENT_TYPE_OBJECT_SUBREQUEST;
   }
 
   if (pszAdditionalHeaders && *pszAdditionalHeaders && IsXmlHttpRequest(*pszAdditionalHeaders))
   {
     m_contentType = ContentType::CONTENT_TYPE_XMLHTTPREQUEST;
   }
 
-  if (client->ShouldBlock(szURL, m_contentType, m_boundDomain, /*debug flag but must be set*/true))
+  if (client->ShouldBlock(src.c_str(), m_contentType, m_boundDomain, /*debug flag but must be set*/true))

[Eric, 2015/11/14 18:11:25]

The first argument for 'ShouldBlock' is "const std::wstring&". There's no need
to convert to C-String.

[sergei, 2015/11/16 09:56:53]

Good catch!

   {
     // NOTE: Feeding custom HTML to Flash, instead of original object subrequest
     // doesn't have much sense. It also can manifest in unwanted result
     // like video being blocked (See https://issues.adblockplus.org/ticket/1669)
     // So we report blocked object subrequests as failed, not just empty HTML.
     m_isCustomResponse = m_contentType != ContentType::CONTENT_TYPE_OBJECT_SUBREQUEST;
     return E_ABORT;
   }
   return nativeHr;
 }
@@ skipping 44 matching lines @@
   }
 
   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInternetProtocol);
 }
 
 STDMETHODIMP WBPassthru::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
 {
   WBPassthruSink* pSink = GetSink();
   return pSink->OnRead(pv, cb, pcbRead);
 }