|
 |
4536d7 |
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
|
|
|
4536d7 |
index 155a4f88..39bffc89 100644
|
|
|
4536d7 |
--- a/src/gui/image/qxbmhandler.cpp
|
|
|
4536d7 |
+++ b/src/gui/image/qxbmhandler.cpp
|
|
|
4536d7 |
@@ -154,7 +154,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage)
|
|
|
4536d7 |
w = (w+7)/8; // byte width
|
|
|
4536d7 |
|
|
|
4536d7 |
while (y < h) { // for all encoded bytes...
|
|
|
4536d7 |
- if (p) { // p = "0x.."
|
|
|
4536d7 |
+ if (p && p < (buf + readBytes - 3)) { // p = "0x.."
|
|
|
4536d7 |
+ if (!isxdigit(p[2]) || !isxdigit(p[3]))
|
|
|
4536d7 |
+ return false;
|
|
|
4536d7 |
*b++ = hex2byte(p+2);
|
|
|
4536d7 |
p += 2;
|
|
|
4536d7 |
if (++x == w && ++y < h) {
|
|
|
4536d7 |
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
|
|
|
4536d7 |
index 170f551d..0f6c91bd 100644
|
|
|
4536d7 |
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
|
|
|
4536d7 |
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
|
|
|
4536d7 |
@@ -164,6 +164,7 @@ private slots:
|
|
|
4536d7 |
void preserveTexts_data();
|
|
|
4536d7 |
void preserveTexts();
|
|
|
4536d7 |
|
|
|
4536d7 |
+ void xbmBufferHandling();
|
|
|
4536d7 |
private:
|
|
|
4536d7 |
QString prefix;
|
|
|
4536d7 |
QTemporaryDir m_temporaryDir;
|
|
|
4536d7 |
@@ -1967,5 +1968,41 @@ void tst_QImageReader::preserveTexts()
|
|
|
4536d7 |
}
|
|
|
4536d7 |
|
|
|
4536d7 |
|
|
|
4536d7 |
+void tst_QImageReader::xbmBufferHandling()
|
|
|
4536d7 |
+{
|
|
|
4536d7 |
+ uint8_t original_buffer[256];
|
|
|
4536d7 |
+ for (int i = 0; i < 256; ++i)
|
|
|
4536d7 |
+ original_buffer[i] = i;
|
|
|
4536d7 |
+
|
|
|
4536d7 |
+ QImage image(original_buffer, 256, 8, QImage::Format_MonoLSB);
|
|
|
4536d7 |
+ image.setColorTable({0xff000000, 0xffffffff});
|
|
|
4536d7 |
+
|
|
|
4536d7 |
+ QByteArray buffer;
|
|
|
4536d7 |
+ {
|
|
|
4536d7 |
+ QBuffer buf(&buffer);
|
|
|
4536d7 |
+ QImageWriter writer(&buf, "xbm");
|
|
|
4536d7 |
+ writer.write(image);
|
|
|
4536d7 |
+ }
|
|
|
4536d7 |
+
|
|
|
4536d7 |
+ QCOMPARE(QImage::fromData(buffer, "xbm"), image);
|
|
|
4536d7 |
+
|
|
|
4536d7 |
+ auto i = buffer.indexOf(',');
|
|
|
4536d7 |
+ buffer.insert(i + 1, " ");
|
|
|
4536d7 |
+ QCOMPARE(QImage::fromData(buffer, "xbm"), image);
|
|
|
4536d7 |
+ buffer.insert(i + 1, " ");
|
|
|
4536d7 |
+ QCOMPARE(QImage::fromData(buffer, "xbm"), image);
|
|
|
4536d7 |
+ buffer.insert(i + 1, " ");
|
|
|
4536d7 |
+#if 0 // Lines longer than 300 chars not supported currently
|
|
|
4536d7 |
+ QCOMPARE(QImage::fromData(buffer, "xbm"), image);
|
|
|
4536d7 |
+#endif
|
|
|
4536d7 |
+
|
|
|
4536d7 |
+ i = buffer.lastIndexOf("\n ");
|
|
|
4536d7 |
+ buffer.truncate(i + 1);
|
|
|
4536d7 |
+ buffer.append(QByteArray(297, ' '));
|
|
|
4536d7 |
+ buffer.append("0x");
|
|
|
4536d7 |
+ // Only check we get no buffer overflow
|
|
|
4536d7 |
+ QImage::fromData(buffer, "xbm");
|
|
|
4536d7 |
+}
|
|
|
4536d7 |
+
|
|
|
4536d7 |
QTEST_MAIN(tst_QImageReader)
|
|
|
4536d7 |
#include "tst_qimagereader.moc"
|