|
 |
f085be |
From 2580f10e8cec6fd9e3356a3a26a1cb6d8192e850 Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f085be |
Date: Sun, 3 Aug 2014 22:47:27 +0200
|
|
|
f085be |
Subject: [PATCH 077/137] avoid buffer overflow by using wrong buffer
|
|
|
f085be |
|
|
|
f085be |
Found by Asan.
|
|
|
f085be |
|
|
|
f085be |
(regression from CWS mba34issues01)
|
|
|
f085be |
|
|
|
f085be |
Change-Id: Ia7159c9bed9d7f823448acd02e18568a5f3f2093
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10717
|
|
|
f085be |
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
|
f085be |
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
|
f085be |
(cherry picked from commit 955c5539a1ea5e971f111989d6c5bec11d936416)
|
|
|
f085be |
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
|
f085be |
---
|
|
|
f085be |
sfx2/source/appl/appuno.cxx | 2 +-
|
|
|
f085be |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
|
|
|
f085be |
index 50f8ee6..461d74c 100644
|
|
|
f085be |
--- a/sfx2/source/appl/appuno.cxx
|
|
|
f085be |
+++ b/sfx2/source/appl/appuno.cxx
|
|
|
f085be |
@@ -1021,7 +1021,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence
|
|
|
f085be |
for ( sal_uInt16 nArg=0; nArg
|
|
|
f085be |
{
|
|
|
f085be |
// check every formal argument of the method
|
|
|
f085be |
- const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
|
|
|
f085be |
+ const SfxFormalArgument &rArg = bIsMediaDescriptor ? aFormalArgs[nArg] : pSlot->GetFormalArgument( nArg );
|
|
|
f085be |
|
|
|
f085be |
sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
|
|
|
f085be |
if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|