Changeset 167499 in webkit

Timestamp:

Apr 18, 2014 12:45:40 PM (10 years ago)

Author:

andersca@apple.com

Message:

Handle pluginOrigin being null
​https://bugs.webkit.org/show_bug.cgi?id=131849
<rdar://problem/16655898>

Reviewed by Alexey Proskuryakov.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::shouldPlugInAutoStartFromOrigin):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-18  Anders Carlsson  <andersca@apple.com>
+
+        Handle pluginOrigin being null
+        https://bugs.webkit.org/show_bug.cgi?id=131849
+        <rdar://problem/16655898>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::shouldPlugInAutoStartFromOrigin):
+
 2014-04-18  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -737 +737 @@
 bool WebProcess::shouldPlugInAutoStartFromOrigin(const WebPage* page, const String& pageOrigin, const String& pluginOrigin, const String& mimeType)
 {
-    if (m_plugInAutoStartOrigins.contains(pluginOrigin))
+    if (!pluginOrigin.isEmpty() && m_plugInAutoStartOrigins.contains(pluginOrigin))
         return true;