diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-13 09:45:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-13 09:49:08 +0100 |
| commit | fe20502c86ef6156a54bb37ba2560c8b64d129a4 (patch) | |
| tree | ec4c58bd5fc3ca943e2578092d8c0097760bd818 /vcl | |
| parent | 7668396d3915359e0b2879938e23c2b68fcb4fe5 (diff) | |
emf: fix another hang
Change-Id: I971ba5f422827f3b8fcdb86c447fc48415225eca
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf | bin | 0 -> 7057 bytes | |||
| -rw-r--r-- | vcl/source/filter/wmf/enhwmf.cxx | 4 |
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 Binary files differnew file mode 100644 index 000000000000..e3baf3bfa7da --- /dev/null +++ b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 62d7b5e13602..d8292ac15b30 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; } |