[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfont.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 28b5fb6aa23ab060cf4ca99097532749e9d4403a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 9 16:58:16 2015 +0000

    bounds check GetNameByIndex like Override
    
    Change-Id: If83e255da1683779458556a3ab1af4f00b19265b
    (cherry picked from commit 8c67b1b51f21643036c5f5371a6af0a4558e7da2)
    Reviewed-on: https://gerrit.libreoffice.org/20546
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index cc27bef..5e0d274 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -399,8 +399,13 @@ void    LwpFontNameManager::Override(sal_uInt16 index, rtl::Reference<XFFont> co
     if(m_pFontNames[index-1].IsAltFaceNameOverridden())
         pFont->SetFontNameAsia(m_FontTbl.GetFaceName(m_pFontNames[index-1].GetAltFaceID()));
 }
+
 OUString LwpFontNameManager::GetNameByIndex(sal_uInt16 index)
+    //index: start from 1
 {
+    if (index > m_nCount || index < 1)
+        return OUString();
+
     sal_uInt16 nameindex = m_pFontNames[index-1].GetFaceID();
     return (m_FontTbl.GetFaceName(nameindex));
 }