Attachment 158272 Details for Bug 93949 – Patch

[patch] Patch

bug-93949-20120814121225.patch (text/plain), 1.70 KB, created by Mike West on 2012-08-14 03:12:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mike West

Created: 2012-08-14 03:12:58 PDT

Size: 1.70 KB

patch

obsolete

>Subversion Revision: 125534
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3c0d142a9a10f172094e412ed042892b6e82d18f..2f255d7ce6771e765b01e5f380a1d268c792bda4 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2012-08-14  Mike West  <mkwst@chromium.org>
>+
>+        Fix crash in http/tests/plugins/plugin-document-has-focus
>+        https://bugs.webkit.org/show_bug.cgi?id=93949
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Covered by http/tests/plugins/plugin-document-has-focus.html. If that
>+        doesn't crash, we're good!
>+
>+        * loader/SubframeLoader.cpp:
>+        (WebCore::SubframeLoader::pluginIsLoadable):
>+            Check the PluginDocument's ownerElement before derefing.
>+
> 2012-08-14  Yoshifumi Inoue  <yosin@chromium.org>
> 
>         [Forms] Copy Source/WebCore/html/shadow/TextControlInnerElements.{cpp,h} to SpinButtonElement.{cpp,h}
>diff --git a/Source/WebCore/loader/SubframeLoader.cpp b/Source/WebCore/loader/SubframeLoader.cpp
>index 9fdcb76d59effa7fea9c079b55a9c4459ff2dcac..d7eb00141acc9440fe6838c09a98ee650dfe263d 100644
>--- a/Source/WebCore/loader/SubframeLoader.cpp
>+++ b/Source/WebCore/loader/SubframeLoader.cpp
>@@ -126,7 +126,7 @@ bool SubframeLoader::pluginIsLoadable(HTMLPlugInImageElement* pluginElement, con
>             return false;
>         }
> 
>-        String declaredMimeType = document()->isPluginDocument() ?
>+        String declaredMimeType = document()->isPluginDocument() && document()->ownerElement() ?
>             document()->ownerElement()->fastGetAttribute(HTMLNames::typeAttr) :
>             pluginElement->fastGetAttribute(HTMLNames::typeAttr);
>         if (!document()->contentSecurityPolicy()->allowObjectFromSource(url)

Actions: View | Formatted Diff | Diff

Attachments on bug 93949: 158272