Issue #1234 - std::wstring version of UnescapeUrl

src/plugin/PluginClientBase.cpp

 #include "PluginStdAfx.h"
 
 // Internet / FTP
 #include <wininet.h>
 
 // IP adapter
 #include <iphlpapi.h>
 
 #include "PluginSettings.h"
 #include "PluginSystem.h"
@@ skipping 22 matching lines @@
 CPluginClientBase::CPluginClientBase()
 {
 }
 
 
 CPluginClientBase::~CPluginClientBase()
 {
 }
 
 
-bool CPluginClientBase::IsValidDomain(const CString& domain)
-{
-  return domain != L"about:blank" &&
-    domain != L"about:tabs" &&
-    domain.Find(L"javascript:") != 0 &&
-    !domain.IsEmpty();
-}
-
-
 CString& CPluginClientBase::UnescapeUrl(CString& url)
 {
   CString unescapedUrl;
   DWORD cb = 2048;
 
   if (SUCCEEDED(::UrlUnescape(url.GetBuffer(), unescapedUrl.GetBufferSetLength(cb), &cb, 0)))
   {
     unescapedUrl.ReleaseBuffer();
     unescapedUrl.Truncate(cb);
 
     url.ReleaseBuffer();
     url = unescapedUrl;
   }
 
   return url;
 }
 
 void UnescapeUrl(std::wstring& url)
 {
   try
   {
     DWORD result_length = INTERNET_MAX_URL_LENGTH;
     std::unique_ptr<wchar_t[]> result(new wchar_t[result_length]);
-    /*
-     * Casting away const here is harmless because we're not using the in-place modification mode of UrlUnescape
-     */
     HRESULT hr = UrlUnescapeW(const_cast<wchar_t*>(url.c_str()), result.get(), &result_length, 0);
     if (hr == S_OK)
     {
       url = std::wstring(result.get(), result_length);
     }
     /*
-     * If the call to UrlUnescape fails, we don't alter the string.
+     * Do nothing. This masks error return values from UrlUnescape without logging the error.
      */
   }
   catch(std::bad_alloc e)
   {
     /*
      * When the code has a systematic way of handling bad_alloc, we'll rethrow (probably).
      * Until then, we mask the exception and make no modification.
      */
   }
   catch(...)
@@ skipping 53 matching lines @@
 
       hasError = true;
 
       s_pluginErrors.erase(it);
     }
   }
   s_criticalSectionLocal.Unlock();
 
   return hasError;
 }