File limit-image-size.diff of Package qt3

Overview Repositories Revisions Requests Users Attributes Meta

File limit-image-size.diff of Package qt3 (Revision cdc42272c4bc9d9a0654c62b6f785b94)

Currently displaying revision cdc42272c4bc9d9a0654c62b6f785b94 , Show latest

Index: kernel/qasyncimageio.cpp
===================================================================
RCS file: /home/kde/qt-copy/src/kernel/qasyncimageio.cpp,v
retrieving revision 1.57
diff -u -p -r1.57 qasyncimageio.cpp
--- src/kernel/qasyncimageio.cpp	11 Aug 2004 14:21:12 -0000	1.57
+++ src/kernel/qasyncimageio.cpp	30 Sep 2004 11:20:38 -0000
@@ -900,7 +900,12 @@ int QGIFFormat::decode(QImage& img, QIma
 		    sheight = newtop + height;
 
 		if (img.isNull()) {
-		    img.create(swidth, sheight, 32);
+		    bool ok = img.create(swidth, sheight, 32);
+		    if (!ok)
+		    {
+			state = Error;
+			break;
+		    }
 		    memset( img.bits(), 0, img.numBytes() );
 		    if (consumer) consumer->setSize(swidth, sheight);
 		}
@@ -969,9 +974,15 @@ int QGIFFormat::decode(QImage& img, QIma
 		    if (backingstore.width() < w
 			|| backingstore.height() < h) {
 			// We just use the backing store as a byte array
-			backingstore.create( QMAX(backingstore.width(), w),
+			bool ok = backingstore.create(
+			                     QMAX(backingstore.width(), w),
 					     QMAX(backingstore.height(), h),
 					     32);
+			if (!ok)
+			{
+			    state = Error;
+			    break;
+			}
 			memset( img.bits(), 0, img.numBytes() );
 		    }
 		    for (int ln=0; ln<h; ln++) {
Index: kernel/qimage.cpp
===================================================================
RCS file: /home/kde/qt-copy/src/kernel/qimage.cpp,v
retrieving revision 1.63
diff -u -p -r1.63 qimage.cpp
--- src/kernel/qimage.cpp	11 Aug 2004 14:21:12 -0000	1.63
+++ src/kernel/qimage.cpp	30 Sep 2004 11:20:41 -0000
@@ -65,6 +65,8 @@
 #define QT_NO_IMAGE_16_BIT
 #endif
 
+int qt_max_image_height = 0;
+int qt_max_image_width = 0;
 
 /*!
     \class QImage
@@ -1196,6 +1198,28 @@ void QImage::setAlphaBuffer( bool enable
     data->alpha = enable;
 }
 
+QSize QImage::maxImageSize()
+{
+    if (!qt_max_image_height || !qt_max_image_width)
+       return QSize();
+    return QSize(qt_max_image_height, qt_max_image_width);
+}
+
+void QImage::setMaxImageSize(const QSize &size)
+{
+    if (size.isValid())
+    {
+        qt_max_image_height = size.height();
+        qt_max_image_width = size.width();
+    }
+    else
+    {
+        qt_max_image_height = 0;
+        qt_max_image_width = 0;
+    }
+}
+
+
 
 /*!
     Sets the image \a width, \a height, \a depth, its number of colors
@@ -1225,6 +1249,14 @@ bool QImage::create( int width, int heig
     reset();					// reset old data
     if ( width <= 0 || height <= 0 || depth <= 0 || numColors < 0 )
 	return FALSE;				// invalid parameter(s)
+    if ( qt_max_image_height && (height > qt_max_image_height * 4))
+        return FALSE; // Too high
+    if ( qt_max_image_width && (width > qt_max_image_width * 4))
+        return FALSE; // Too wide
+    if ( qt_max_image_height && qt_max_image_width &&
+         (height * width > qt_max_image_height * qt_max_image_width))
+        return FALSE; // Too large
+    
     if ( depth == 1 && bitOrder == IgnoreEndian ) {
 #if defined(QT_CHECK_RANGE)
 	qWarning( "QImage::create: Bit order is required for 1 bpp images" );
===================================================================
RCS file: /home/kde/qt-copy/src/kernel/qimage.h,v
retrieving revision 1.49
diff -u -p -r1.49 qimage.h
--- src/kernel/qimage.h	16 May 2003 13:02:41 -0000	1.49
+++ src/kernel/qimage.h	30 Sep 2004 11:20:41 -0000
@@ -194,6 +193,10 @@ public:
 		      int quality=-1 ) const;
     bool	save( QIODevice * device, const char* format,
 		      int quality=-1 ) const;
+		      
+#define QT_HAVE_MAX_IMAGE_SIZE
+    static QSize maxImageSize();
+    static void setMaxImageSize(const QSize &size);
 #endif //QT_NO_IMAGEIO
 
     bool	valid( int x, int y ) const;

Places

File limit-image-size.diff of Package qt3 (Revision cdc42272c4bc9d9a0654c62b6f785b94)

Places