[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - svx/source

[Caolán McNamara]

 svx/source/dialog/searchcharmap.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ebd78caf7ff49328b902158ad101e9496b0f7a5b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 23 10:06:38 2018 +0000

    a11y crash with no chars selected in character map
    
    type gibberish in character map search box, click character map widget,
    crash
    
    Change-Id: Ifa3e4bce2d7e0b84cf3c5033eb819c73076daabe
    Reviewed-on: https://gerrit.libreoffice.org/51775
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx
index db6f4e37bbcd..66101b21d703 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -437,7 +437,8 @@ svx::SvxShowCharSetItem* SvxSearchCharSet::ImplGetItem( int _nPos )
         aFind = m_aItems.emplace(_nPos, xItem).first;
         OUStringBuffer buf;
         std::unordered_map<sal_Int32,sal_UCS4>::const_iterator got = m_aItemList.find (_nPos);
-        buf.appendUtf32( got->second );
+        if (got != m_aItemList.end())
+            buf.appendUtf32(got->second);
         aFind->second->maText = buf.makeStringAndClear();
         Point pix = MapIndexToPixel( _nPos );
         aFind->second->maRect = tools::Rectangle( Point( pix.X() + 1, pix.Y() + 1 ), Size(nX-1,nY-1) );