File 0001-Check-for-QImage-allocation-failure-in-qgi... of Package libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Check-for-QImage-allocation-failure-in-qgifhandler.patch of Package libqt5-qtbase (Revision 1813ae35414dd18344454d27186db9e0)

Currently displaying revision 1813ae35414dd18344454d27186db9e0 , Show latest

From ac0a910756f91726e03c0e6a89d213bdb4f48fec Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@qt.io>
Date: Fri, 3 Aug 2018 13:25:15 +0200
Subject: [PATCH] Check for QImage allocation failure in qgifhandler

Since image files easily can be (or corrupt files claim to be) huge,
it is worth checking for out of memory situations.

Change-Id: I635a3ec6852288079fdec4e14cf7e776fe59e9e0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 2841e2b61e32f26900bde987d469c8b97ea31999)
(cherry picked from commit f9324103a0f824de2c5243f07a86e7906b8a8ea6)
---
 src/gui/image/qgifhandler.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
index 4197d7e959..5d4a230af7 100644
--- a/src/gui/image/qgifhandler.cpp
+++ b/src/gui/image/qgifhandler.cpp
@@ -348,7 +348,8 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
                     (*image) = QImage(swidth, sheight, format);
                     bpl = image->bytesPerLine();
                     bits = image->bits();
-                    memset(bits, 0, image->byteCount());
+                    if (bits)
+                        memset(bits, 0, image->byteCount());
                 }
 
                 // Check if the previous attempt to create the image failed. If it
@@ -409,6 +410,10 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
                         backingstore = QImage(qMax(backingstore.width(), w),
                                               qMax(backingstore.height(), h),
                                               QImage::Format_RGB32);
+                        if (backingstore.isNull()) {
+                            state = Error;
+                            return -1;
+                        }
                         memset(backingstore.bits(), 0, backingstore.byteCount());
                     }
                     const int dest_bpl = backingstore.bytesPerLine();
-- 
2.16.4

Places

File 0001-Check-for-QImage-allocation-failure-in-qgifhandler.patch of Package libqt5-qtbase (Revision 1813ae35414dd18344454d27186db9e0)

Places