[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - writerfilter/source

[Caolán McNamara (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc3428ef8b6e784f7f8785d1574608df928099a7
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jun 27 10:00:13 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jun 27 21:40:53 2022 +0200

    crashtesting: fix assert seen with forum-mso-en-8349.docx
    
    a string that ends in spaces
    
    Change-Id: I808f046be816d0d4a76f801a349e284024a2061c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136464
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index af8e2dc5946b..fd1c79f66667 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4494,7 +4494,7 @@ static OUString lcl_ExtractVariableAndHint( 
std::u16string_view rCommand, OUStri
     size_t nIndex = rCommand.find( ' ', 2); //find last space after 'ASK'
     if (nIndex == std::u16string_view::npos)
         return OUString();
-    while(rCommand[nIndex] == ' ')
+    while (nIndex < rCommand.size() && rCommand[nIndex] == ' ')
         ++nIndex;
     std::u16string_view sShortCommand( rCommand.substr( nIndex ) ); //cut off 
the " ASK "