diff options
Diffstat (limited to 'tests/auto/gui/image/qimagereader/tst_qimagereader.cpp')
| -rw-r--r-- | tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 1eee2f273e..61b11a7779 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -167,6 +167,9 @@ private slots: void devicePixelRatio_data(); void devicePixelRatio(); + void xpmBufferOverflow(); + void xbmBufferHandling(); + private: QString prefix; QTemporaryDir m_temporaryDir; @@ -2002,5 +2005,47 @@ void tst_QImageReader::devicePixelRatio() QCOMPARE(img.devicePixelRatio(), dpr); } +void tst_QImageReader::xpmBufferOverflow() +{ + // Please note that the overflow only showed when Qt was configured with "-sanitize address". + QImageReader(":/images/oss-fuzz-23988.xpm").read(); +} + +void tst_QImageReader::xbmBufferHandling() +{ + uint8_t original_buffer[256]; + for (int i = 0; i < 256; ++i) + original_buffer[i] = i; + + QImage image(original_buffer, 256, 8, QImage::Format_MonoLSB); + image.setColorTable({0xff000000, 0xffffffff}); + + QByteArray buffer; + { + QBuffer buf(&buffer); + QImageWriter writer(&buf, "xbm"); + writer.write(image); + } + + QCOMPARE(QImage::fromData(buffer, "xbm"), image); + + auto i = buffer.indexOf(','); + buffer.insert(i + 1, " "); + QCOMPARE(QImage::fromData(buffer, "xbm"), image); + buffer.insert(i + 1, " "); + QCOMPARE(QImage::fromData(buffer, "xbm"), image); + buffer.insert(i + 1, " "); +#if 0 // Lines longer than 300 chars not supported currently + QCOMPARE(QImage::fromData(buffer, "xbm"), image); +#endif + + i = buffer.lastIndexOf("\n "); + buffer.truncate(i + 1); + buffer.append(QByteArray(297, ' ')); + buffer.append("0x"); + // Only check we get no buffer overflow + QImage::fromData(buffer, "xbm"); +} + QTEST_MAIN(tst_QImageReader) #include "tst_qimagereader.moc" |