vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf |binary
vcl/source/filter/wmf/enhwmf.cxx | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 776618f628ea6302374c90722c3dbd0a6dac1c19
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 13 09:45:55 2015 +0100
emf: fix another hang
Change-Id: I971ba5f422827f3b8fcdb86c447fc48415225eca
(cherry picked from commit fe20502c86ef6156a54bb37ba2560c8b64d129a4)
Reviewed-on: https://gerrit.libreoffice.org/16979
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf
new file mode 100644
index 0000000..e3baf3b
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index bd48610..553f871 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1712,9 +1712,9 @@ bool EnhWMFReader::ReadHeader()
pWMF->ReadInt32(nRecordCount);
- if (nRecordCount == 0)
+ if (nRecordCount <= 0)
{
- SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as
0! This shouldn't "
+ SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as
<= 0! This shouldn't "
"be possible... indicator of possible file
corruption?");
return false;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
