55 lines
3.0 KiB
Diff
55 lines
3.0 KiB
Diff
diff -up qt-everywhere-opensource-src-4.8.6/src/gui/image/qbmphandler.cpp.than qt-everywhere-opensource-src-4.8.6/src/gui/image/qbmphandler.cpp
|
|
--- qt-everywhere-opensource-src-4.8.6/src/gui/image/qbmphandler.cpp.than 2015-04-13 16:03:24.347475762 +0200
|
|
+++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qbmphandler.cpp 2015-04-13 16:04:42.781923479 +0200
|
|
@@ -478,12 +478,6 @@ static bool read_dib_body(QDataStream &s
|
|
p = data + (h-y-1)*bpl;
|
|
break;
|
|
case 2: // delta (jump)
|
|
- // Protection
|
|
- if ((uint)x >= (uint)w)
|
|
- x = w-1;
|
|
- if ((uint)y >= (uint)h)
|
|
- y = h-1;
|
|
-
|
|
{
|
|
quint8 tmp;
|
|
d->getChar((char *)&tmp);
|
|
@@ -491,6 +485,13 @@ static bool read_dib_body(QDataStream &s
|
|
d->getChar((char *)&tmp);
|
|
y += tmp;
|
|
}
|
|
+
|
|
+ // Protection
|
|
+ if ((uint)x >= (uint)w)
|
|
+ x = w-1;
|
|
+ if ((uint)y >= (uint)h)
|
|
+ y = h-1;
|
|
+
|
|
p = data + (h-y-1)*bpl + x;
|
|
break;
|
|
default: // absolute mode
|
|
diff -up qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.than qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
|
|
--- qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.than 2015-04-13 16:10:38.284420268 +0200
|
|
+++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp 2015-04-13 16:11:17.406144797 +0200
|
|
@@ -944,6 +944,8 @@ void QGIFFormat::fillRect(QImage *image,
|
|
|
|
void QGIFFormat::nextY(unsigned char *bits, int bpl)
|
|
{
|
|
+ if (out_of_bounds)
|
|
+ return;
|
|
int my;
|
|
switch (interlace) {
|
|
case 0: // Non-interlaced
|
|
diff -up qt-everywhere-opensource-src-4.8.6/src/plugins/imageformats/ico/qicohandler.cpp.than qt-everywhere-opensource-src-4.8.6/src/plugins/imageformats/ico/qicohandler.cpp
|
|
--- qt-everywhere-opensource-src-4.8.6/src/plugins/imageformats/ico/qicohandler.cpp.than 2015-04-13 16:05:02.059787728 +0200
|
|
+++ qt-everywhere-opensource-src-4.8.6/src/plugins/imageformats/ico/qicohandler.cpp 2015-04-13 16:05:41.141512553 +0200
|
|
@@ -571,7 +571,7 @@ QImage ICOReader::iconAt(int index)
|
|
QImage::Format format = QImage::Format_ARGB32;
|
|
if (icoAttrib.nbits == 24)
|
|
format = QImage::Format_RGB32;
|
|
- else if (icoAttrib.ncolors == 2)
|
|
+ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
|
|
format = QImage::Format_Mono;
|
|
else if (icoAttrib.ncolors > 0)
|
|
format = QImage::Format_Indexed8;
|