Changeset 62846 in webkit


Ignore:
Timestamp:
Jul 8, 2010 2:37:02 PM (14 years ago)
Author:
jhoneycutt@apple.com
Message:

WebCore: Missing plug-ins may cause an assertion failure.
https://bugs.webkit.org/show_bug.cgi?id=41900

Reviewed by Adele Peterson.

Test: plugins/missing-plugin.html

  • plugins/PluginView.cpp:

(WebCore::PluginView::~PluginView):
Check whether m_instance is null before trying to remove it from the
map. Trying to remove a null instance results in an assertion failure.
(WebCore::PluginView::PluginView):
Initialize m_instance to 0, because there is an early return that may
skip its being assigned its proper value.

LayoutTests: Missing plug-ins may cause an assertion failure
https://bugs.webkit.org/show_bug.cgi?id=41900

Reviewed by Adele Peterson.

  • plugins/missing-plugin.html: Added.
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r62844 r62846  
     12010-07-08  Jon Honeycutt  <jhoneycutt@apple.com>
     2
     3        Missing plug-ins may cause an assertion failure
     4        https://bugs.webkit.org/show_bug.cgi?id=41900
     5
     6        Reviewed by Adele Peterson.
     7
     8        * plugins/missing-plugin.html: Added.
     9
    1102010-07-08  Ojan Vafai  <ojan@chromium.org>
    211
  • trunk/WebCore/ChangeLog

    r62845 r62846  
     12010-07-08  Jon Honeycutt  <jhoneycutt@apple.com>
     2
     3        Missing plug-ins may cause an assertion failure.
     4        https://bugs.webkit.org/show_bug.cgi?id=41900
     5
     6        Reviewed by Adele Peterson.
     7
     8        Test: plugins/missing-plugin.html
     9
     10        * plugins/PluginView.cpp:
     11        (WebCore::PluginView::~PluginView):
     12        Check whether m_instance is null before trying to remove it from the
     13        map. Trying to remove a null instance results in an assertion failure.
     14        (WebCore::PluginView::PluginView):
     15        Initialize m_instance to 0, because there is an early return that may
     16        skip its being assigned its proper value.
     17
    1182010-07-08  Darin Adler  <darin@apple.com>
    219
  • trunk/WebCore/plugins/PluginView.cpp

    r59904 r62846  
    285285    ASSERT(!m_lifeSupportTimer.isActive());
    286286
    287     instanceMap().remove(m_instance);
     287    // If we failed to find the plug-in, we'll return early in our constructor, and
     288    // m_instance will be 0.
     289    if (m_instance)
     290        instanceMap().remove(m_instance);
    288291
    289292    if (m_isWaitingToStart)
     
    812815    , m_paramValues(0)
    813816    , m_mimeType(mimeType)
     817    , m_instance(0)
    814818#if defined(XP_MACOSX)
    815819    , m_isWindowed(false)
Note: See TracChangeset for help on using the changeset viewer.