From ae58f6fcb0cc9eb83781602aabbf0a35add26f42 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 13 Jul 2015 09:45:55 +0100 Subject: emf: fix another hang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I971ba5f422827f3b8fcdb86c447fc48415225eca (cherry picked from commit fe20502c86ef6156a54bb37ba2560c8b64d129a4) Reviewed-on: https://gerrit.libreoffice.org/16998 Reviewed-by: David Tardon Reviewed-by: Eike Rathke Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf | Bin 0 -> 7057 bytes vcl/source/filter/wmf/enhwmf.cxx | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf 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 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 741ec15d7a9f..dcd802c6c46d 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -1728,9 +1728,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; } -- cgit