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

crashtesting: assert on loading forum-mso-en-11942.docx

Browse source 
with getToken index past end

Change-Id: I9bfeb9cacd8ad89de8008d37c88d15350ef84fb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136340
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2022-06-23 14:35:35 +01:00
parent a564dcff85
commit 05cd9a7354
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
writerfilter/source/dmapper/DomainMapper_Impl.cxx
View file

@ -6743,19 +6743,26 @@ void DomainMapper_Impl::CloseFieldCommand()
break;
case FIELD_MACROBUTTON:
{
//extract macro name
sal_Int32 nIndex = sizeof(" MACROBUTTON ");
OUString sMacro = pContext->GetCommand().getToken( 0, ' ', nIndex);
if (xFieldProperties.is())
xFieldProperties->setPropertyValue(
getPropertyName(PROP_MACRO_NAME), uno::Any( sMacro ));
//extract quick help text
if(xFieldProperties.is() && pContext->GetCommand().getLength() > nIndex + 1)
{
xFieldProperties->setPropertyValue(
getPropertyName(PROP_HINT),
uno::Any( pContext->GetCommand().copy( nIndex )));
sal_Int32 nIndex = sizeof(" MACROBUTTON ");
OUString sCommand = pContext->GetCommand();
//extract macro name
if (sCommand.getLength() >= nIndex)
{
OUString sMacro = sCommand.getToken(0, ' ', nIndex);
xFieldProperties->setPropertyValue(
getPropertyName(PROP_MACRO_NAME), uno::Any( sMacro ));
}
//extract quick help text
if (sCommand.getLength() > nIndex + 1)
{
xFieldProperties->setPropertyValue(
getPropertyName(PROP_HINT),
uno::Any( sCommand.copy( nIndex )));
}
}
}
break;