summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2015-05-23 18:48:53 +0200
committerSlávek Banko <[email protected]>2015-05-23 18:54:01 +0200
commitd07bc24c915c0830ed41907d8ebfe53281fd210e (patch)
treec397572751071dfbeb77b35a64860323dcc04d03
parent2dbd340ba29c2689c1974a942b9d4e63c51d66e8 (diff)
downloadtqt3-d07bc24c915c0830ed41907d8ebfe53281fd210e.tar.gz
tqt3-d07bc24c915c0830ed41907d8ebfe53281fd210e.zip
Fix security issue CVE-2015-1860
[taken from RedHat Qt3 patches] (cherry picked from commit 094708c0e7379cbc825488cd6101c6b8a610302a)
-rw-r--r--src/kernel/qasyncimageio.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index 489d69af2..e26ef399d 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -1226,6 +1226,8 @@ void TQGIFFormat::fillRect(TQImage& img, int col, int row, int w, int h, TQRgb c
void TQGIFFormat::nextY(TQImage& img, TQImageConsumer* consumer)
{
+ if (out_of_bounds)
+ return;
int my;
switch (interlace) {
case 0: