AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent crash due to giving QWidget::update() a large region.

Browse Source 
Similar to what change a298216bb4 does for update(QRect) we clip
the update region against the widget's rect and return if it's empty.
Otherwise we risk ending up with update rects that are larger than
INT_MAX due to multiple update rects being merged.

Task-number: QTBUG-30876
Change-Id: Idf695b1fdca50449a1e5ddf37500653de290590c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
This commit is contained in:
Samuel Rødal 2013-04-26 10:36:04 +02:00 committed by The Qt Project
parent f963d70c30
commit 69ee30260a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widgets/kernel/qwidget.cpp
View File

@ -9909,11 +9909,16 @@ void QWidget::update(const QRect &rect)
*/
void QWidget::update(const QRegion &rgn)
{
if (!isVisible() || !updatesEnabled() || rgn.isEmpty())
if (!isVisible() || !updatesEnabled())
return;
QRegion r = rgn & QWidget::rect();
if (r.isEmpty())
return;
if (testAttribute(Qt::WA_WState_InPaintEvent)) {
QApplication::postEvent(this, new QUpdateLaterEvent(rgn));
QApplication::postEvent(this, new QUpdateLaterEvent(r));
return;
}
@ -9926,9 +9931,9 @@ void QWidget::update(const QRegion &rgn)
#endif // Q_WS_MAC
QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
tlwExtra->backingStoreTracker->markDirty(rgn, this);
tlwExtra->backingStoreTracker->markDirty(r, this);
} else {
d_func()->repaint_sys(rgn);
d_func()->repaint_sys(r);
}
}