diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-02 12:15:35 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-02 12:42:12 +0200 |
| commit | 51e3df40bc757b46636a3d74681a597fe35063ba (patch) | |
| tree | 9b78f723ef0f2c52eb5e661781bece459054c934 /sd | |
| parent | 811180e9dd983e1166139ea27c256055763af477 (diff) | |
WaE: indexes past the end of an array
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 6 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 9705c3855aa1..1e65805ed606 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -964,7 +964,11 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer // storing user data into pAny, to allow direct access later const Sequence< NamedValue > aUserData = xNode->getUserData(); - const ::com::sun::star::uno::Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ]; + + // ids start from 1, DFF_ANIM_PROPERTY_ID_COUNT is the highest id + // number + const ::com::sun::star::uno::Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT + 1 ]; + GetUserData( aUserData, pAny, sizeof( pAny ) ); if( pAny[ DFF_ANIM_AFTEREFFECT ] ) diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 4811289b2647..1c11a6973ba3 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -986,7 +986,11 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons } const Sequence< NamedValue > aUserData = rXNode->getUserData(); - const Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ]; + + // ids start from 1, DFF_ANIM_PROPERTY_ID_COUNT is the highest id + // number + const Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT + 1]; + AnimationExporter::GetUserData( aUserData, pAny, sizeof( pAny ) ); sal_Int16 nType = 0; |