diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-13 09:10:12 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:56:10 +0200 |
| commit | 5b5976483a7c2c6d8369bee21b3040e9b4006d8a (patch) | |
| tree | 28940169dd90308ee1a06b804ba516d54d2737db /vcl | |
| parent | c55bce765cc9f6afef92743cf7fc5561a1dea7b3 (diff) | |
emf: fix hang
Change-Id: I2410308ecccb8c5318a718bafadc7b40a98cb82b
(cherry picked from commit 8695633023cc321a095753db98bdc69d2aeee058)
Reviewed-on: https://gerrit.libreoffice.org/16976
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf | bin | 0 -> 2225 bytes | |||
| -rw-r--r-- | vcl/source/filter/wmf/enhwmf.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf Binary files differnew file mode 100644 index 000000000000..634fccdc0f22 --- /dev/null +++ b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index f02871de2bd3..de78559fec38 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -663,7 +663,7 @@ bool EnhWMFReader::ReadEnhWMF() SAL_INFO("vcl.emf", "\tGDI comment, length: " << length); - if( pWMF->good() && length >= 4 ) { + if( pWMF->good() && length >= 4 && length <= pWMF->remainingSize() ) { sal_uInt32 id; pWMF->ReadUInt32( id ); |