Source/core/style/ComputedStyle.cpp - Issue 1016863002: Fix integer overflow in ComputedStyle::computedLineHeight

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: Source/core/style/ComputedStyle.cpp

Issue 1016863002: Fix integer overflow in ComputedStyle::computedLineHeight (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Clamp explicitly Created 5 years, 8 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

Index: Source/core/style/ComputedStyle.cpp

diff --git a/Source/core/style/ComputedStyle.cpp b/Source/core/style/ComputedStyle.cpp

index be6750a2d58f368f365364f44fa3add27163e796..a4c2f8158858bc44eadb7395ee89f3a0b1e2bfc3 100644

--- a/Source/core/style/ComputedStyle.cpp

+++ b/Source/core/style/ComputedStyle.cpp

@@ -1256,7 +1256,7 @@ int ComputedStyle::computedLineHeight() const

if (lh.isPercent())

return minimumValueForLength(lh, fontSize());

- return lh.value();

+ return std::min(lh.value(), LayoutUnit::max().toFloat());

}

void ComputedStyle::setWordSpacing(float wordSpacing)

« no previous file with comments | « LayoutTests/fast/shapes/shape-outside-floats/shape-outside-line-height-crash2-expected.txt ('k') | no next file » | no next file with comments »