Fix null-check in SVGLengthContext::convertValueFromCHSToUserUnits (issue 2445463002 by eae@chromium.org)
0 views
Skip to first unread message
eae@chromium.org via chromiumcodereview-hr.appspot.com
Oct 21, 2016, 6:14:32 PM10/21/16
to p...@chromium.org, e...@chromium.org, chromium...@chromium.org, dsch...@chromium.org, rob....@samsung.com, f...@opera.com, fma...@chromium.org, blink-...@chromium.org, gyuyou...@chromium.org, sche...@chromium.org, kouhe...@chromium.org, pdr+svgw...@chromium.org
Reviewers: pdr.
CL: https://codereview.chromium.org/2445463002/
Description:
Fix null-check in SVGLengthContext::convertValueFromCHSToUserUnits
BUG=657438
R=p...@chromium.org
Affected files (+4, -1 lines):
M third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
Index: third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp b/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
index bd4cf089796b580dc03810a7fd2d4dcd88b938b4..a8d35f3e0110ee72e1112f3d8a39bc4e6f773837 100644
--- a/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
@@ -387,8 +387,11 @@ float SVGLengthContext::convertValueFromUserUnitsToCHS(float value) const {
float SVGLengthContext::convertValueFromCHSToUserUnits(float value) const {
const ComputedStyle* style = computedStyleForLengthResolving(m_context);
+ if (!style)
+ return 0;
+
const SimpleFontData* fontData = style->font().primaryFont();
- if (!style || !fontData)
+ if (!fontData)
return 0;
return value * fontData->getFontMetrics().zeroWidth() /
CL: https://codereview.chromium.org/2445463002/
Description:
Fix null-check in SVGLengthContext::convertValueFromCHSToUserUnits
BUG=657438
R=p...@chromium.org
Affected files (+4, -1 lines):
M third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
Index: third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp b/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
index bd4cf089796b580dc03810a7fd2d4dcd88b938b4..a8d35f3e0110ee72e1112f3d8a39bc4e6f773837 100644
--- a/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
@@ -387,8 +387,11 @@ float SVGLengthContext::convertValueFromUserUnitsToCHS(float value) const {
float SVGLengthContext::convertValueFromCHSToUserUnits(float value) const {
const ComputedStyle* style = computedStyleForLengthResolving(m_context);
+ if (!style)
+ return 0;
+
const SimpleFontData* fontData = style->font().primaryFont();
- if (!style || !fontData)
+ if (!fontData)
return 0;
return value * fontData->getFontMetrics().zeroWidth() /
p...@chromium.org
Oct 21, 2016, 6:15:08 PM10/21/16
to e...@chromium.org, chromium...@chromium.org, dsch...@chromium.org, rob....@samsung.com, f...@opera.com, fma...@chromium.org, blink-...@chromium.org, gyuyou...@chromium.org, sche...@chromium.org, kouhe...@chromium.org, pdr+svgw...@chromium.org
e...@chromium.org
Oct 21, 2016, 6:29:00 PM10/21/16
to p...@chromium.org, chromium...@chromium.org, dsch...@chromium.org, rob....@samsung.com, f...@opera.com, fma...@chromium.org, blink-...@chromium.org, gyuyou...@chromium.org, sche...@chromium.org, kouhe...@chromium.org, pdr+svgw...@chromium.org
Thanks. This was due to a silly mistake in my last patch. Luckily clusterfuzz
caught it :)
https://codereview.chromium.org/2445463002/
caught it :)
https://codereview.chromium.org/2445463002/
commit-bot@chromium.org via chromiumcodereview-hr.appspot.com
Oct 21, 2016, 6:41:31 PM10/21/16
to e...@chromium.org, p...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dsch...@chromium.org, rob....@samsung.com, f...@opera.com, fma...@chromium.org, blink-...@chromium.org, gyuyou...@chromium.org, sche...@chromium.org, kouhe...@chromium.org, pdr+svgw...@chromium.org
CQ is trying da patch. Follow status at
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2445463002/1
https://codereview.chromium.org/2445463002/
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2445463002/1
https://codereview.chromium.org/2445463002/
commit-bot@chromium.org via chromiumcodereview-hr.appspot.com
Oct 21, 2016, 10:18:18 PM10/21/16
to e...@chromium.org, p...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dsch...@chromium.org, rob....@samsung.com, f...@opera.com, fma...@chromium.org, blink-...@chromium.org, gyuyou...@chromium.org, sche...@chromium.org, kouhe...@chromium.org, pdr+svgw...@chromium.org
Try jobs failed on following builders:
linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/321744)
https://codereview.chromium.org/2445463002/
linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/321744)
https://codereview.chromium.org/2445463002/
commit-bot@chromium.org via chromiumcodereview-hr.appspot.com
Oct 22, 2016, 1:23:01 AM10/22/16
to e...@chromium.org, p...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dsch...@chromium.org, rob....@samsung.com, f...@opera.com, fma...@chromium.org, blink-...@chromium.org, gyuyou...@chromium.org, sche...@chromium.org, kouhe...@chromium.org, pdr+svgw...@chromium.org
commit-bot@chromium.org via chromiumcodereview-hr.appspot.com
Oct 22, 2016, 2:54:34 AM10/22/16
to e...@chromium.org, p...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dsch...@chromium.org, rob....@samsung.com, f...@opera.com, fma...@chromium.org, blink-...@chromium.org, gyuyou...@chromium.org, sche...@chromium.org, kouhe...@chromium.org, pdr+svgw...@chromium.org
commit-bot@chromium.org via chromiumcodereview-hr.appspot.com
Oct 22, 2016, 2:56:33 AM10/22/16
to e...@chromium.org, p...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dsch...@chromium.org, rob....@samsung.com, f...@opera.com, fma...@chromium.org, blink-...@chromium.org, gyuyou...@chromium.org, sche...@chromium.org, kouhe...@chromium.org, pdr+svgw...@chromium.org
Patchset 1 (id:??) landed as
https://crrev.com/ca7b171d703b3bc08e2a141901a1640a913ef95a
Cr-Commit-Position: refs/heads/master@{#426987}
https://codereview.chromium.org/2445463002/
https://crrev.com/ca7b171d703b3bc08e2a141901a1640a913ef95a
Cr-Commit-Position: refs/heads/master@{#426987}
https://codereview.chromium.org/2445463002/
Reply all
Reply to author
Forward
0 new messages