summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-08-03 22:47:27 +0200
committerMichael Stahl <mstahl@redhat.com>2014-08-04 14:08:22 +0200
commit0eb715086898543fb09addb6cd68526120f81f73 (patch)
tree2a37ecd3342b2032a806da0a330ba6b4deaed93c
parentb28c11025b08cae4cd4685c75fbc474d2c216fb0 (diff)
avoid buffer overflow by using wrong buffer
Found by Asan. (regression from CWS mba34issues01) Change-Id: Ia7159c9bed9d7f823448acd02e18568a5f3f2093 Reviewed-on: https://gerrit.libreoffice.org/10717 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 955c5539a1ea5e971f111989d6c5bec11d936416) Signed-off-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sfx2/source/appl/appuno.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 8f44b07b88f9..a16ab3e4e670 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -972,7 +972,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
for ( sal_uInt16 nArg=0; nArg<nFormalArgs; ++nArg )
{
// check every formal argument of the method
- const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
+ const SfxFormalArgument &rArg = bIsMediaDescriptor ? aFormalArgs[nArg] : pSlot->GetFormalArgument( nArg );
sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???