Attachment 341224 Details for Bug 185960 – Patch

[patch] Patch

bug-185960-20180524143707.patch (text/plain), 2.05 KB, created by youenn fablet on 2018-05-24 14:37:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-05-24 14:37:07 PDT

Size: 2.05 KB

patch

obsolete

>Subversion Revision: 232123
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 27792e391495b48e140d308ae547a3ba1fa8b42e..4aca4959438ee4c03678943158bbe591f18cf948 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-24  Youenn Fablet  <youenn@apple.com>
>+
>+        Update plugin search path to look for user installed plugins
>+        https://bugs.webkit.org/show_bug.cgi?id=185960
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Now that UIProcess may be sandboxed, the home directory is no longer the user home directory.
>+        Update the path to still look for plugins in the user home directory.
>+
>+        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
>+        (WebKit::PluginInfoStore::pluginsDirectories):
>+
> 2018-05-23  Youenn Fablet  <youenn@apple.com>
> 
>         Migrate From-Origin to Cross-Origin-Resource-Policy
>diff --git a/Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm b/Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
>index 54b612572cbf9cea4372adb279b4f89275e70ee0..257c94c5784d1ce195b446c37cc5fdb702e30576 100644
>--- a/Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
>+++ b/Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
>@@ -32,6 +32,7 @@
> #import "NetscapePluginModule.h"
> #import "SandboxUtilities.h"
> #import <WebCore/PluginBlacklist.h>
>+#import <pwd.h>
> #import <wtf/HashSet.h>
> #import <wtf/RetainPtr.h>
> #import <wtf/text/CString.h>
>@@ -43,9 +44,13 @@ namespace WebKit {
> Vector<String> PluginInfoStore::pluginsDirectories()
> {
>     Vector<String> pluginsDirectories;
>+    pluginsDirectories.reserveInitialCapacity(2);
> 
>-    pluginsDirectories.append([NSHomeDirectory() stringByAppendingPathComponent:@"Library/Internet Plug-Ins"]);
>-    pluginsDirectories.append("/Library/Internet Plug-Ins");
>+    ASCIILiteral pluginPath { "/Library/Internet Plug-Ins" };
>+
>+    if (auto* pw = getpwuid(getuid()))
>+        pluginsDirectories.uncheckedAppend(makeString(pw->pw_dir, pluginPath));
>+    pluginsDirectories.uncheckedAppend(pluginPath);
>     
>     return pluginsDirectories;
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 185960: 341224