cid#1545597 Using invalid iterator

and :

cid#1545537 Using invalid iterator
cid#1545508 Using invalid iterator
cid#1545494 Using invalid iterator
cid#1545478 Using invalid iterator
cid#1545427 Using invalid iterator
cid#1545420 Using invalid iterator
cid#1545400 Using invalid iterator
cid#1545300 Using invalid iterator
cid#1545258 Using invalid iterator
cid#1545257 Using invalid iterator
cid#1545200 Using invalid iterator
cid#1545183 Using invalid iterator

Change-Id: Ibf3a41902f34286967195c5c3b22e337a4b06809
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160322
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

1 files changed, 7 insertions, 3 deletions

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index c8891889b01d..15cbecc32db3 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1687,7 +1687,9 @@ SvxAutoCorrectLanguageLists& SvxAutoCorrect::GetLanguageList_(
     LanguageTag aLanguageTag( eLang);
     if (m_aLangTable.find(aLanguageTag) == m_aLangTable.end())
         (void)CreateLanguageFile(aLanguageTag);
-    return m_aLangTable.find(aLanguageTag)->second;
+    const auto iter = m_aLangTable.find(aLanguageTag);
+    assert(iter != m_aLangTable.end());
+    return iter->second;
 }
 
 void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
@@ -1912,14 +1914,16 @@ void SvxAutoCorrect::MakeCombinedChanges( std::vector<SvxAutocorrWord>& aNewEntr
                                               LanguageType eLang )
 {
     LanguageTag aLanguageTag( eLang);
-    auto const iter = m_aLangTable.find(aLanguageTag);
+    auto iter = m_aLangTable.find(aLanguageTag);
     if (iter != m_aLangTable.end())
     {
         iter->second.MakeCombinedChanges( aNewEntries, aDeleteEntries );
     }
     else if(CreateLanguageFile( aLanguageTag ))
     {
-        m_aLangTable.find( aLanguageTag )->second.MakeCombinedChanges( aNewEntries, aDeleteEntries );
+        iter = m_aLangTable.find(aLanguageTag);
+        assert(iter != m_aLangTable.end());
+        iter->second.MakeCombinedChanges( aNewEntries, aDeleteEntries );
     }
 }