third_party/WebKit/Source/core/layout/LayoutText.cpp - Issue 2345633007: Don't overflow in LayoutText::width() on a huge length.

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/layout/LayoutText.cpp

Issue 2345633007: Don't overflow in LayoutText::width() on a huge length. (Closed)

Patch Set: Tweak test ranges for Mac results. Created 4 years, 3 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:

Index: third_party/WebKit/Source/core/layout/LayoutText.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutText.cpp b/third_party/WebKit/Source/core/layout/LayoutText.cpp

index 2dbaf857cf174032c1a2b13fbfcf7879d8ff693e..8d3e6d24adf9a0871ac1f35682ed773fbb13b959 100644

--- a/third_party/WebKit/Source/core/layout/LayoutText.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutText.cpp

@@ -1575,7 +1575,7 @@ float LayoutText::width(unsigned from, unsigned len, LayoutUnit xPos, TextDirect

if (from >= textLength())

return 0;

- if (from + len > textLength())

+ if (len > textLength() || from + len > textLength())

len = textLength() - from;

return width(from, len, style(firstLine)->font(), xPos, textDirection, fallbackFonts, glyphBounds);