diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 09:43:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 09:43:01 (GMT) |
| commit | 177131d06d0d7a39d5de210ac8ed5dff9ca4999f (patch) | |
| tree | 37c1df4b1236447c5960d3d21bbdafdf1bdaec2f /src/gui | |
| parent | 36c81f4972b5cfbac825d18e99d9a28dd82542d8 (diff) | |
| parent | db9925a187a9ad395ba2cabf23487b9a0e09c67c (diff) | |
| download | Qt-177131d06d0d7a39d5de210ac8ed5dff9ca4999f.zip Qt-177131d06d0d7a39d5de210ac8ed5dff9ca4999f.tar.gz Qt-177131d06d0d7a39d5de210ac8ed5dff9ca4999f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Added test case for corrupt pixel count in XPM image.
QImage crash when invalid XPM is read.
Fix an issue with removing rows in a table model.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qxpmhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp index a02b3ff..76cd813 100644 --- a/src/gui/image/qxpmhandler.cpp +++ b/src/gui/image/qxpmhandler.cpp @@ -882,7 +882,7 @@ static bool read_xpm_body( QByteArray buf(200, 0); int i; - if (cpp > 15) + if (cpp < 0 || cpp > 15) return false; // For > 256 colors, we delay creation of the image until |