Index: src/plugin/PluginUtil.cpp |
=================================================================== |
--- a/src/plugin/PluginUtil.cpp |
+++ b/src/plugin/PluginUtil.cpp |
@@ -16,13 +16,10 @@ |
*/ |
#include "PluginStdAfx.h" |
-#include <algorithm> |
-#include <stdexcept> |
-#include <vector> |
- |
+#include "PluginUtil.h" |
#include "../shared/Utils.h" |
-#include "PluginUtil.h" |
-#include "PluginSettings.h" |
+#include <memory> |
+#include <WinInet.h> |
std::wstring HtmlFolderPath() |
{ |
@@ -54,4 +51,32 @@ |
return std::wstring(); |
} |
return std::wstring(locationUrl, locationUrl.Length()); |
-} |
+} |
+ |
+void UnescapeUrl(std::wstring& url) |
+{ |
+ try |
+ { |
+ DWORD result_length = INTERNET_MAX_URL_LENGTH; |
+ std::unique_ptr<wchar_t[]> result(new wchar_t[result_length]); |
+ 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); |
+ } |
+ /* |
+ * 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(...) |
+ { |
+ // no modification if any other exception |
+ } |
+} |