From 954f0d93976362d29044439e4eaa11d2dff16624 Mon Sep 17 00:00:00 2001
From: Rainer Keller <rainer.keller@theqtcompany.com>
Date: Mon, 29 Jun 2015 10:16:36 +0200
Subject: [PATCH] Add test for invalid exif data

Task-number: QTBUG-46870
Change-Id: Idfde92ca12336c6432798b4517e244c2f5a5ba4d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
 .../jpeg_exif_invalid_data_QTBUG-46870.jpg      | Bin 0 -> 14122 bytes
 tests/auto/gui/image/qimage/tst_qimage.cpp      |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_invalid_data_QTBUG-46870.jpg

diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_invalid_data_QTBUG-46870.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_invalid_data_QTBUG-46870.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a51a1e3162bb360ecc580614cb4e19cc7b31b74c
GIT binary patch
literal 14122
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

literal 0
HcmV?d00001

diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index f7c71f05bd..8286c800c2 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -185,6 +185,7 @@ private slots:
     void exifOrientation();
 
     void exif_QTBUG45865();
+    void exif_invalid_data_QTBUG46870();
 
     void cleanupFunctions();
 
@@ -2872,6 +2873,13 @@ void tst_QImage::exif_QTBUG45865()
     QCOMPARE(image.size(), QSize(5, 8));
 }
 
+void tst_QImage::exif_invalid_data_QTBUG46870()
+{
+    QImage image;
+    QVERIFY(image.load(m_prefix + "jpeg_exif_invalid_data_QTBUG-46870.jpg"));
+    QVERIFY(!image.isNull());
+}
+
 static void cleanupFunction(void* info)
 {
     bool *called = static_cast<bool*>(info);