Merge r176554 - CrashTracer: com.apple.WebKit.WebContent at com.apple…

….WebCore: WebCore::HTMLPlugInImageElement::updateSnapshot + 108 https://bugs.webkit.org/show_bug.cgi?id=139057 Reviewed by Anders Carlsson. No test, don't know how to repro. * html/HTMLPlugInImageElement.cpp: (WebCore::HTMLPlugInImageElement::updateSnapshot): Null check the renderer. Canonical link: https://commits.webkit.org/154760.241@webkitgtk/2.6 git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@178276 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jan 12, 2015 · 2fb5139 · 2fb5139
1 parent da36f48
commit 2fb5139
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2014-11-27  Antti Koivisto  <antti@apple.com>
+
+        CrashTracer: com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::HTMLPlugInImageElement::updateSnapshot + 108
+        https://bugs.webkit.org/show_bug.cgi?id=139057
+
+        Reviewed by Anders Carlsson.
+
+        No test, don't know how to repro.
+
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::updateSnapshot): Null check the renderer.
+
 2014-11-25  Philippe Normand  <pnormand@igalia.com>
 
         [GStreamer] gstmpegts is not initialized

diff --git a/Source/WebCore/html/HTMLPlugInImageElement.cpp b/Source/WebCore/html/HTMLPlugInImageElement.cpp
@@ -334,6 +334,9 @@ void HTMLPlugInImageElement::updateSnapshot(PassRefPtr<Image> image)
 
     m_snapshotImage = image;
 
+    if (!renderer())
+        return;
+
     if (renderer()->isSnapshottedPlugIn()) {
         toRenderSnapshottedPlugIn(renderer())->updateSnapshot(image);
         return;