dev/null |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2004-0691-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2006-0006-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-2244-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-3741-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2007-3741-2.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2008-1097-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/CVE-2008-5870-1.bmp | 1 +
vcl/qa/cppunit/graphicfilter/data/bmp/fail/EDB-24743-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/EDB-24743-4.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-5870-1.bmp | 1 -
vcl/source/gdi/impgraph.cxx | 7 ++++++-
13 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 22aeb2cdddab4b8b903126d651751838e63cbf73
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Sep 16 21:16:10 2015 +0100
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 <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2004-0691-1.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2006-0006-1.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-2244-1.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-1.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-2.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-1097-1.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-5870-1.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-1.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-4.bmp
rename to 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
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
rename to 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 186815a..4050efe 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
