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 48 matching lines @@
     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.
+     */
+  }
+  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(...)
+  {
+    // no modification if any other exception
+  }
+}
 
 void CPluginClientBase::LogPluginError(DWORD errorCode, int errorId, int errorSubid, const CString& description, bool isAsync, DWORD dwProcessId, DWORD dwThreadId)
 {
   // Prevent circular references
   if (CPluginSettings::HasInstance() && isAsync)
   {
     DEBUG_ERROR_CODE_EX(errorCode, description, dwProcessId, dwThreadId);
 
     CString pluginError;
     pluginError.Format(L"%2.2d%2.2d", errorId, errorSubid);
@@ skipping 39 matching lines @@
 
       hasError = true;
 
       s_pluginErrors.erase(it);
     }
   }
   s_criticalSectionLocal.Unlock();
 
   return hasError;
 }