third_party/WebKit/Source/core/editing/EditingUtilities.cpp - Issue 2135993003: Add null check to fix crash in blink::ComputedStyle::display

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/editing/EditingUtilities.cpp

Issue 2135993003: Add null check to fix crash in blink::ComputedStyle::display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: use of the short form for running the insertHTML command Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/editing/execCommand/crash-inserting-span.html ('K') | « third_party/WebKit/LayoutTests/editing/execCommand/crash-inserting-span.html ('k') | third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/EditingUtilities.cpp

diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp

index b578e7ac3c35b9dc58802d82561ef41414f6ccf6..55d7cc9b33bc198a0a406be02cc84a7a324cc6e2 100644

--- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp

+++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp

@@ -765,7 +765,11 @@ bool isEnclosingBlock(const Node* node)

bool isInline(const Node* node)

{

- return node && node->computedStyle()->display() == INLINE;

+ if (!node)

+ return false;

+ const ComputedStyle* style = node->computedStyle();

+ return style && style->display() == INLINE;

}

// TODO(yosin) Deploy this in all of the places where |enclosingBlockFlow()| and