summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-13 09:45:55 +0100
committerDavid Tardon <dtardon@redhat.com>2015-07-13 13:21:57 +0000
commit776618f628ea6302374c90722c3dbd0a6dac1c19 (patch)
treef087233732e21c1be4bad2b519edbf977db5abfb
parentbd7b37b8fcf193e2ce20a84ac68bdb22ed8a9ade (diff)
emf: fix another hang
Change-Id: I971ba5f422827f3b8fcdb86c447fc48415225eca (cherry picked from commit fe20502c86ef6156a54bb37ba2560c8b64d129a4) Reviewed-on: https://gerrit.libreoffice.org/16979 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emfbin0 -> 7057 bytes
-rw-r--r--vcl/source/filter/wmf/enhwmf.cxx4
2 files changed, 2 insertions, 2 deletions
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 000000000000..e3baf3bfa7da
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf
Binary files differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index bd486103619b..553f87127d01 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;
}