Cosmetic stroker: avoid overflows for non-finite coordinates
int overflows are usually avoided by clipping the qreal coordinates to the device rect. However the clip function did not handle inf or nan coordinates, so such values would be passed on. Fix by treating any line with such coordinates a fully clipped away, i.e. rejecting it, since it cannot be meaningfully stroked anyway. Fixes oss-fuzz issue 25330. Pick-to: 6.0 5.15 5.12 Change-Id: I4646172fc7a7e0a3a5f5cf03ce10ff0fb56b0d03 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io>bb10
parent
caa632803d
commit
cfad8a352a
|
|
@ -321,6 +321,8 @@ void QCosmeticStroker::setup()
|
|||
// returns true if the whole line gets clipped away
|
||||
bool QCosmeticStroker::clipLine(qreal &x1, qreal &y1, qreal &x2, qreal &y2)
|
||||
{
|
||||
if (!qIsFinite(x1) || !qIsFinite(y1) || !qIsFinite(x2) || !qIsFinite(y2))
|
||||
return true;
|
||||
// basic/rough clipping is done in floating point coordinates to avoid
|
||||
// integer overflow problems.
|
||||
if (x1 < xmin) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue