strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves: tdf#59222 Crash in Basic with an array of values...

Browse source 
from a range address

trying to make all SbxVariables reference count their parents
is ludiciously hard, so just reference count this one known
crashing case

Change-Id: Ie1fa6624e8184146dd00d766cdbacef674153ef6
Reviewed-on: https://gerrit.libreoffice.org/26272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2016-06-14 15:48:52 +01:00
parent be2cf3d28b
commit 9f0997eb16
4 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basic/source/runtime/methods1.cxx
View file

@ -830,7 +830,7 @@ RTLFUNC(Array)
for( sal_uInt16 i = 0 ; i < nArraySize ; i++ )
{
SbxVariable* pVar = rPar.Get(i+1);
SbxVariable* pNew = new SbxVariable( *pVar );
SbxVariable* pNew = new SbxEnsureParentVariable(*pVar);
pNew->SetFlag( SbxFlagBits::Write );
short index = static_cast< short >(i);
if ( bIncIndex )

15
basic/source/sbx/sbxvar.cxx
View file

@ -100,6 +100,21 @@ SbxVariable::SbxVariable( const SbxVariable& r )
}
}
SbxEnsureParentVariable::SbxEnsureParentVariable(const SbxVariable& r)
: SbxVariable(r)
, xParent(const_cast<SbxVariable&>(r).GetParent())
{
assert(GetParent() == xParent.get());
}
void SbxEnsureParentVariable::SetParent(SbxObject* p)
{
assert(GetParent() == xParent.get());
SbxVariable::SetParent(p);
xParent = SbxObjectRef(p);
assert(GetParent() == xParent.get());
}
SbxVariable::SbxVariable( SbxDataType t, void* p ) : SbxValue( t, p )
{
pCst = nullptr;

2
include/basic/sbxobj.hxx
View file

@ -81,8 +81,6 @@ public:
void Dump( SvStream&, bool bDumpAll=false );
};
typedef tools::SvRef<SbxObject> SbxObjectRef;
#endif // INCLUDED_BASIC_SBXOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

11
include/basic/sbxvar.hxx
View file

@ -283,8 +283,19 @@ public:
static sal_uInt16 MakeHashCode( const OUString& rName );
};
typedef tools::SvRef<SbxObject> SbxObjectRef;
typedef tools::SvRef<SbxVariable> SbxVariableRef;
//tdf#59222 SbxEnsureParentVariable is a SbxVariable which keeps a reference to
//its parent, ensuring it always exists while this SbxVariable exists
class BASIC_DLLPUBLIC SbxEnsureParentVariable : public SbxVariable
{
SbxObjectRef xParent;
public:
SbxEnsureParentVariable(const SbxVariable& r);
virtual void SetParent(SbxObject* p) override;
};
#endif // INCLUDED_BASIC_SBXVAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */