diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-13 09:10:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-13 09:11:45 +0100 |
| commit | 8695633023cc321a095753db98bdc69d2aeee058 (patch) | |
| tree | fbf318780e7d5765983623d513778e6aed330497 | |
| parent | 7df4d8544c6b12e31bcb81d9389d03ae7c11bfea (diff) | |
emf: fix hang
Change-Id: I2410308ecccb8c5318a718bafadc7b40a98cb82b
| -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 e0eba9279b4b..62d7b5e13602 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 ); |