third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp - Issue 2597103002: Prevent floating point overflow when using calc() with large values

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/css/resolver/StyleBuilderConverter.cpp

Issue 2597103002: Prevent floating point overflow when using calc() with large values (Closed)

Patch Set: Bigger numbers Created 4 years 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

« no previous file with comments | « third_party/WebKit/Source/core/css/CSSCalculationValue.cpp ('k') | third_party/WebKit/Source/platform/LengthFunctions.cpp » ('j') | third_party/WebKit/Source/platform/LengthFunctions.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

index d1ae57fd2811dd9d2ea429c296c1cc852c959ff1..bff57a8fcd82df3034bf6cafaf8bafefe011ca87 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

@@ -850,8 +850,10 @@ Length StyleBuilderConverter::convertLineHeight(StyleResolverState& state,

100.0,

Fixed);

}

- if (primitiveValue.isNumber())

- return Length(primitiveValue.getDoubleValue() * 100.0, Percent);

+ if (primitiveValue.isNumber()) {

+ return Length(clampTo<float>(primitiveValue.getDoubleValue() * 100.0),

+ Percent);

+ }

if (primitiveValue.isCalculated()) {

Length zoomedLength = Length(primitiveValue.cssCalcValue()->toCalcValue(

lineHeightToLengthConversionData(state)));