Changeset 191603 in webkit


Ignore:
Timestamp:
Oct 26, 2015, 3:01:03 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Null dereference loading Blink layout test editing/execCommand/indent-nested-blockquotes-crash.html
​https://bugs.webkit.org/show_bug.cgi?id=149291
<rdar://problem/22746473>

Patch by Jiewen Tan <​jiewen_tan@apple.com> on 2015-10-26
Reviewed by Darin Adler.

Source/WebCore:

This is a merge of Blink r172967:
​https://codereview.chromium.org/251723003

Test: editing/execCommand/indent-nested-blockquotes-crash.html

  • editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::insertNodeAfter):

LayoutTests:

  • editing/execCommand/indent-nested-blockquotes-crash-expected.txt: Added.
  • editing/execCommand/indent-nested-blockquotes-crash.html: Added.
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r191597 r191603  
     12015-10-26  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Null dereference loading Blink layout test editing/execCommand/indent-nested-blockquotes-crash.html
     4        https://bugs.webkit.org/show_bug.cgi?id=149291
     5        <rdar://problem/22746473>
     6
     7        Reviewed by Darin Adler.
     8
     9        * editing/execCommand/indent-nested-blockquotes-crash-expected.txt: Added.
     10        * editing/execCommand/indent-nested-blockquotes-crash.html: Added.
     11
    1122015-10-26  Jiewen Tan  <jiewen_tan@apple.com>
    213

  • trunk/Source/WebCore/ChangeLog

    r191598 r191603  
     12015-10-26  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Null dereference loading Blink layout test editing/execCommand/indent-nested-blockquotes-crash.html
     4        https://bugs.webkit.org/show_bug.cgi?id=149291
     5        <rdar://problem/22746473>
     6
     7        Reviewed by Darin Adler.
     8
     9        This is a merge of Blink r172967:
     10        https://codereview.chromium.org/251723003
     11
     12        Test: editing/execCommand/indent-nested-blockquotes-crash.html
     13
     14        * editing/CompositeEditCommand.cpp:
     15        (WebCore::CompositeEditCommand::insertNodeAfter):
     16
    1172015-10-26  Brady Eidson  <beidson@apple.com>
    218

  • trunk/Source/WebCore/editing/CompositeEditCommand.cpp

    r191596 r191603  
    351351    ASSERT(refChild);
    352352    ContainerNode* parent = refChild->parentNode();
    353     ASSERT(parent);
     353    if (!parent)
     354        return;
     355
    354356    ASSERT(!parent->isShadowRoot());
    355357    if (parent->lastChild() == refChild)
Note: See TracChangeset for help on using the changeset viewer.