Title: [226354] trunk/Source/WebKit
- Revision
- 226354
- Author
- carlo...@webkit.org
- Date
- 2018-01-03 00:18:13 -0800 (Wed, 03 Jan 2018)
Log Message
Unreviewed. Really fix plugin process after r226327.
* PluginProcess/unix/PluginProcessMainUnix.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (226353 => 226354)
--- trunk/Source/WebKit/ChangeLog 2018-01-03 05:10:37 UTC (rev 226353)
+++ trunk/Source/WebKit/ChangeLog 2018-01-03 08:18:13 UTC (rev 226354)
@@ -1,3 +1,9 @@
+2018-01-03 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Really fix plugin process after r226327.
+
+ * PluginProcess/unix/PluginProcessMainUnix.cpp:
+
2018-01-02 Brent Fulgham <bfulg...@apple.com>
[macOS, iOS] Adopt new secure coding APIs in WebKit
Modified: trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp (226353 => 226354)
--- trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp 2018-01-03 05:10:37 UTC (rev 226353)
+++ trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp 2018-01-03 08:18:13 UTC (rev 226354)
@@ -65,17 +65,20 @@
bool parseCommandLine(int argc, char** argv) override
{
- ASSERT(argc == 4);
- if (argc != 4)
+ ASSERT(argc > 2);
+ if (argc < 3)
return false;
- if (!strcmp(argv[2], "-scanPlugin"))
+ if (!strcmp(argv[1], "-scanPlugin")) {
+ ASSERT(argc == 3);
#if PLUGIN_ARCHITECTURE(UNIX)
- exit(NetscapePluginModule::scanPlugin(argv[3]) ? EXIT_SUCCESS : EXIT_FAILURE);
+ exit(NetscapePluginModule::scanPlugin(argv[2]) ? EXIT_SUCCESS : EXIT_FAILURE);
#else
exit(EXIT_FAILURE);
#endif
+ }
+ ASSERT(argc == 4);
#if PLATFORM(X11)
if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::X11) {
auto* display = downcast<WebCore::PlatformDisplayX11>(WebCore::PlatformDisplay::sharedDisplay()).native();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
