[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml/misc
From:       Fredrik Höglund <fredrik () kde ! org>
Date:       2010-02-21 23:15:41
Message-ID: 1266794141.911568.31470.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1094031 by fredrik:

Avoid hitting an assert when drawing a dashed or dotted border arc with
a radius that's smaller than or equal to the border width.

Thanks to Tommi Tervo for debugging.
Fixed for: 4.4.1
BUG: 227765


 M  +4 -0      borderarcstroker.cpp  


--- trunk/KDE/kdelibs/khtml/misc/borderarcstroker.cpp #1094030:1094031
@@ -335,6 +335,10 @@
     const QRectF outerRect = rect;
     const QRectF innerRect = rect.adjusted(hlw, vlw, -hlw, -vlw);
 
+    // Avoid hitting the assert below if the radius is smaller than the border width
+    if (!outerRect.isValid() || !innerRect.isValid())
+        return QPainterPath();
+
     QPainterPath innerPath, outerPath;
     innerPath.arcMoveTo(innerRect, angle);
     outerPath.arcMoveTo(outerRect, angle);
[prev in list] [next in list] [prev in thread] [next in thread]