Title: [259966] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 259966
- Author
- [email protected]
- Date
- 2020-04-12 06:04:17 -0700 (Sun, 12 Apr 2020)
Log Message
Merge r259382 - [WPE][GTK] Public API should not allow trying to register a special URI scheme
https://bugs.webkit.org/show_bug.cgi?id=209900
Reviewed by Carlos Garcia Campos.
No new tests needed.
* UIProcess/API/glib/WebKitWebContext.cpp:
(webkit_web_context_register_uri_scheme): Use g_return_if_fail() to
check at the public API level whether the passed URI scheme is
special and bail out early.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (259965 => 259966)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-04-12 13:04:13 UTC (rev 259965)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-04-12 13:04:17 UTC (rev 259966)
@@ -1,3 +1,17 @@
+2020-04-02 Adrian Perez de Castro <[email protected]>
+
+ [WPE][GTK] Public API should not allow trying to register a special URI scheme
+ https://bugs.webkit.org/show_bug.cgi?id=209900
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests needed.
+
+ * UIProcess/API/glib/WebKitWebContext.cpp:
+ (webkit_web_context_register_uri_scheme): Use g_return_if_fail() to
+ check at the public API level whether the passed URI scheme is
+ special and bail out early.
+
2020-04-02 Carlos Garcia Campos <[email protected]>
[GTK] [2.28.0] The Yelp build crashes if DISPLAY is not set
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (259965 => 259966)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2020-04-12 13:04:13 UTC (rev 259965)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2020-04-12 13:04:17 UTC (rev 259966)
@@ -1236,6 +1236,14 @@
g_return_if_fail(scheme);
g_return_if_fail(callback);
+ // List from Source/WTF/URLParser.cpp, enum Scheme.
+ g_return_if_fail(!g_ascii_strcasecmp(scheme, "ws"));
+ g_return_if_fail(!g_ascii_strcasecmp(scheme, "wss"));
+ g_return_if_fail(!g_ascii_strcasecmp(scheme, "file"));
+ g_return_if_fail(!g_ascii_strcasecmp(scheme, "ftp"));
+ g_return_if_fail(!g_ascii_strcasecmp(scheme, "http"));
+ g_return_if_fail(!g_ascii_strcasecmp(scheme, "https"));
+
auto handler = WebKitURISchemeHandler::create(context, callback, userData, destroyNotify);
auto addResult = context->priv->uriSchemeHandlers.set(String::fromUTF8(scheme), WTFMove(handler));
for (auto* webView : context->priv->webViews.values())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
