diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2020-08-18 14:41:01 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2020-08-18 21:58:30 +0200 |
| commit | 7f1945c5fb492505db9a43853987eaf805291919 (patch) | |
| tree | 7667c113643ffa1de4e3d6d5cd6053981e841dc9 /src/svg | |
| parent | ebba0d76654e86b26a63a1310d6b3e859fd16ffe (diff) | |
Fix check against division by zero
The squared values must not be zero. Since both are qreal,
this can happen even when neither of them is zero itself.
Fixes: oss-fuzz-24738
Pick-to: 5.12 5.15
Change-Id: I61b2bc891e7e3831d4b6ee68b467db28c4f877d4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/qsvghandler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 29f3564..62fe3d3 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1496,7 +1496,10 @@ static void pathArc(QPainterPath &path, qreal y, qreal curx, qreal cury) { - if (!rx || !ry) + const qreal Pr1 = rx * rx; + const qreal Pr2 = ry * ry; + + if (!Pr1 || !Pr2) return; qreal sin_th, cos_th; @@ -1505,7 +1508,7 @@ static void pathArc(QPainterPath &path, qreal d, sfactor, sfactor_sq; qreal th0, th1, th_arc; int i, n_segs; - qreal dx, dy, dx1, dy1, Pr1, Pr2, Px, Py, check; + qreal dx, dy, dx1, dy1, Px, Py, check; rx = qAbs(rx); ry = qAbs(ry); @@ -1517,8 +1520,6 @@ static void pathArc(QPainterPath &path, dy = (cury - y) / 2.0; dx1 = cos_th * dx + sin_th * dy; dy1 = -sin_th * dx + cos_th * dy; - Pr1 = rx * rx; - Pr2 = ry * ry; Px = dx1 * dx1; Py = dy1 * dy1; /* Spec : check if radii are large enough */ |