diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-25 18:12:38 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-07-25 18:12:38 +0200 |
| commit | 0c94a18a0020c2f54ad3284edd25cfb64d34bed7 (patch) | |
| tree | a7ad691bbbb5ea88c137333843aa31c8ae67e5ca | |
| parent | db2278e2adbbd6584782216818e9d0e3746547d7 (diff) | |
EMF+ records don't need payload all the time
Fix for fdo#39517. Looking through the emf+ records, it looks like the
assumption made that the minimum valid record length is 12 + non-0
length payload isnt' right, looks like that the minimum valid record
length is just 12, i.e. no need for a payload.
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
| -rw-r--r-- | svtools/source/filter.vcl/wmf/enhwmf.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx index 45c3cee4b0..e321b208eb 100644 --- a/svtools/source/filter.vcl/wmf/enhwmf.cxx +++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx @@ -275,7 +275,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC) sal_uInt32 nRemainder = length >= 4 ? length-4 : length; const size_t nRequiredHeaderSize = 12; - while (nRemainder > nRequiredHeaderSize) + while (nRemainder >= nRequiredHeaderSize) { sal_uInt16 type(0), flags(0); sal_uInt32 size(0), dataSize(0); |