diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-25 18:09:37 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-07-25 18:09:37 +0200 |
| commit | bd030a5777ff6a17dd36ee19bfe8853a3f65ef4f (patch) | |
| tree | c9d0482be2732fc467ac0b08a6f588c2e673c1db /svtools | |
| parent | 67f11e53d03467ab664b8cfa23d69bacc777b714 (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.
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter/wmf/enhwmf.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svtools/source/filter/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx index 654f8a19a5c0..d0bff3134467 100644 --- a/svtools/source/filter/wmf/enhwmf.cxx +++ b/svtools/source/filter/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); |