Title: [259967] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 259967
- Author
- [email protected]
- Date
- 2020-04-12 06:04:20 -0700 (Sun, 12 Apr 2020)
Log Message
Merge r259459 - Unreviewed fix after r259382
Rubber-stamped by Carlos Garcia Campos.
No new tests needed.
* UIProcess/API/glib/WebKitWebContext.cpp:
(webkit_web_context_register_uri_scheme): Change g_return_if_fail()
calls to actually check that the passed scheme is not one of the
special ones.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (259966 => 259967)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-04-12 13:04:17 UTC (rev 259966)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-04-12 13:04:20 UTC (rev 259967)
@@ -1,3 +1,16 @@
+2020-04-03 Adrian Perez de Castro <[email protected]>
+
+ Unreviewed fix after r259382
+
+ Rubber-stamped by Carlos Garcia Campos.
+
+ No new tests needed.
+
+ * UIProcess/API/glib/WebKitWebContext.cpp:
+ (webkit_web_context_register_uri_scheme): Change g_return_if_fail()
+ calls to actually check that the passed scheme is not one of the
+ special ones.
+
2020-04-02 Adrian Perez de Castro <[email protected]>
[WPE][GTK] Public API should not allow trying to register a special URI scheme
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (259966 => 259967)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2020-04-12 13:04:17 UTC (rev 259966)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2020-04-12 13:04:20 UTC (rev 259967)
@@ -1237,12 +1237,12 @@
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"));
+ g_return_if_fail(g_ascii_strcasecmp(scheme, "ws") != 0);
+ g_return_if_fail(g_ascii_strcasecmp(scheme, "wss") != 0);
+ g_return_if_fail(g_ascii_strcasecmp(scheme, "file") != 0);
+ g_return_if_fail(g_ascii_strcasecmp(scheme, "ftp") != 0);
+ g_return_if_fail(g_ascii_strcasecmp(scheme, "http") != 0);
+ g_return_if_fail(g_ascii_strcasecmp(scheme, "https") != 0);
auto handler = WebKitURISchemeHandler::create(context, callback, userData, destroyNotify);
auto addResult = context->priv->uriSchemeHandlers.set(String::fromUTF8(scheme), WTFMove(handler));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
