From 789f9d0d56204354652760fcde407b30b3b3aded Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 29 Aug 2017 15:08:59 +0200 Subject: Avoid assert on large clips in qt_alphamapblit_generic It is (end - start) that represent the number of pixels being worked on and needs to be smaller than the buffer size. Change-Id: I75a22bc2656ac1c7d231278c3a1931758090f8ce Reviewed-by: Gatis Paeglis Reviewed-by: Laszlo Agocs --- src/gui/painting/qdrawhelper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/painting') diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 5c6c91f0ba..c78fdfe62e 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -5627,7 +5627,7 @@ static void qt_alphamapblit_generic(QRasterBuffer *rasterBuffer, int start = qMax(x, clip.x); int end = qMin(x + mapWidth, clip.x + clip.len); - Q_ASSERT(clip.len <= buffer_size); + Q_ASSERT(end - start <= buffer_size); QRgba64 *dest = destFetch64((QRgba64*)buffer, rasterBuffer, start, clip.y, end - start); for (int xp=start; xp(x, clip.x); int end = qMin(x + mapWidth, clip.x + clip.len); - Q_ASSERT(clip.len <= buffer_size); + Q_ASSERT(end - start <= buffer_size); QRgba64 *dest = destFetch64((QRgba64*)buffer, rasterBuffer, start, clip.y, end - start); for (int xp=start; xp