Title: [250211] releases/WebKitGTK/webkit-2.26/Source/WebKit
- Revision
- 250211
- Author
- carlo...@webkit.org
- Date
- 2019-09-23 01:46:32 -0700 (Mon, 23 Sep 2019)
Log Message
Merge r249882 - [GTK][WPE] Check for a Snap sandbox a bit harder
https://bugs.webkit.org/show_bug.cgi?id=201793
Reviewed by Michael Catanzaro.
* UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
(WebKit::isInsideSnap): Check whether the SNAP_NAME and SNAP_REVISION
environment variables are defined as well.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog (250210 => 250211)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog 2019-09-23 08:39:16 UTC (rev 250210)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog 2019-09-23 08:46:32 UTC (rev 250211)
@@ -1,3 +1,14 @@
+2019-09-14 Adrian Perez de Castro <ape...@igalia.com>
+
+ [GTK][WPE] Check for a Snap sandbox a bit harder
+ https://bugs.webkit.org/show_bug.cgi?id=201793
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
+ (WebKit::isInsideSnap): Check whether the SNAP_NAME and SNAP_REVISION
+ environment variables are defined as well.
+
2019-09-17 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Initial view loading is slow
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp (250210 => 250211)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2019-09-23 08:39:16 UTC (rev 250210)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2019-09-23 08:46:32 UTC (rev 250211)
@@ -76,7 +76,10 @@
if (ret)
return *ret;
- ret = g_getenv("SNAP");
+ // The "SNAP" environment variable is not unlikely to be set for/by something other
+ // than Snap, so check a couple of additional variables to avoid false positives.
+ // See: https://snapcraft.io/docs/environment-variables
+ ret = g_getenv("SNAP") && g_getenv("SNAP_NAME") && g_getenv("SNAP_REVISION");
return *ret;
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
