diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/page/WindowFeatures.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/page/WindowFeatures.cpp')
| -rw-r--r-- | Source/WebCore/page/WindowFeatures.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/page/WindowFeatures.cpp b/Source/WebCore/page/WindowFeatures.cpp index 7768a09cd..d93420161 100644 --- a/Source/WebCore/page/WindowFeatures.cpp +++ b/Source/WebCore/page/WindowFeatures.cpp @@ -111,7 +111,7 @@ WindowFeatures::WindowFeatures(const String& features) i++; valueEnd = i; - ASSERT(i <= length); + ASSERT_WITH_SECURITY_IMPLICATION(i <= length); String keyString(buffer.substring(keyBegin, keyEnd - keyBegin)); String valueString(buffer.substring(valueBegin, valueEnd - valueBegin)); @@ -224,7 +224,7 @@ float WindowFeatures::floatFeature(const DialogFeaturesMap& features, const char // return the number 0 and false for ok. But "0q" should yield the minimum rather than the default. bool ok; double parsedNumber = it->value.toDouble(&ok); - if ((parsedNumber == 0 && !ok) || isnan(parsedNumber)) + if ((!parsedNumber && !ok) || std::isnan(parsedNumber)) return defaultValue; if (parsedNumber < min || max <= min) return min; |