bmp failure not detected as such because of svg fallback test

I thought it was suspicious that everything was a pass

Change-Id: I10b98cc19d2e23bd5d518113785aeca3a0ea346a
Reviewed-on: https://gerrit.libreoffice.org/18662
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

11 files changed, 6 insertions, 1 deletions

diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2004-0691-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2004-0691-1.bmp
index d77db5782972..d77db5782972 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2004-0691-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2004-0691-1.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2006-0006-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2006-0006-1.bmp
index 4cfbdfff8358..4cfbdfff8358 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2006-0006-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2006-0006-1.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-2244-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-2244-1.bmp
index 289cf8c0e964..289cf8c0e964 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-2244-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-2244-1.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-3741-1.bmp
index 84ac054db55c..84ac054db55c 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-3741-1.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-2.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-3741-2.bmp
index a6aed5983d33..a6aed5983d33 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-2.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-3741-2.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-1097-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2008-1097-1.bmp
index 76aaecf97e77..76aaecf97e77 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-1097-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2008-1097-1.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-5870-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2008-5870-1.bmp
index d223dde288b5..d223dde288b5 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-5870-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2008-5870-1.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/EDB-24743-1.bmp
index 2b58d1035cf6..2b58d1035cf6 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/EDB-24743-1.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-4.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/EDB-24743-4.bmp
index cfe7e40f678c..cfe7e40f678c 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-4.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/EDB-24743-4.bmp
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp
index 84b6c35c87e6..84b6c35c87e6 100644
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 186815ad2160..4050efe38fc0 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1527,6 +1527,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
                     }
                     else
                     {
+                        sal_uInt32 nOrigError = rIStm.GetErrorCode();
                         // try to stream in Svg defining data (length, byte array and evtl. path)
                         // See below (operator<<) for more information
                         const sal_uInt32 nSvgMagic((sal_uInt32('s') << 24) | (sal_uInt32('v') << 16) | (sal_uInt32('g') << 8) | sal_uInt32('0'));
@@ -1535,7 +1536,11 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
                         rIStm.ResetError();
                         rIStm.ReadUInt32( nMagic );
 
-                        if(nSvgMagic == nMagic)
+                        if (nSvgMagic != nMagic)
+                        {
+                            rIStm.SetError(nOrigError);
+                        }
+                        else
                         {
                             sal_uInt32 mnSvgDataArrayLength(0);
                             rIStm.ReadUInt32( mnSvgDataArrayLength );