[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source

[Caolán McNamara]

 sw/inc/strings.hrc                              |    6 +++---
 sw/source/core/doc/DocumentStylePoolManager.cxx |   16 +++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit f7c4e8cbf840193acb7c188163f51c8a3a14e083
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 23 19:55:54 2017 +0100

    coverity#1415614 Out-of-bounds read
    
    Change-Id: I73d18dd6613be063002878fb4906a49863707856

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index d94d336d44a1..685555675402 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1380,18 +1380,16 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
             pDeriveFormat = m_rDoc.GetDfltCharFormat();
             pWhichRange = aCharFormatSetRange;
 
-            // Fault: unknown Format, but a CharFormat
-            //             -> return the first one
-            if( RES_POOLCHR_BEGIN > nId || nId >= RES_POOLCHR_END )
+            if (nId >= RES_POOLCHR_HTML_BEGIN && nId < RES_POOLCHR_HTML_END)
+                pRCId = STR_POOLCHR_HTML_ARY[nId - RES_POOLCHR_HTML_BEGIN];
+            else if (nId >= RES_POOLCHR_NORMAL_BEGIN && nId < RES_POOLCHR_NORMAL_END)
+                pRCId = STR_POOLCHR_ARY[nId - RES_POOLCHR_BEGIN];
+            else
             {
+                // Fault: unknown Format, but a CharFormat -> return the first one
                 OSL_ENSURE( false, "invalid Id" );
-                nId = RES_POOLCHR_BEGIN;
+                pRCId = STR_POOLCHR_ARY[0];
             }
-
-            if (nId > RES_POOLCHR_NORMAL_END)
-                pRCId = STR_POOLCHR_HTML_ARY[nId - RES_POOLCHR_HTML_BEGIN];
-            else
-                pRCId = STR_POOLCHR_ARY[nId - RES_POOLCHR_BEGIN];
         }
         break;
     case POOLGRP_FRAMEFMT:
commit 1d663165fc35ce41610e9a73e168ac2adc0153e2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 23 19:48:30 2017 +0100

    more related strings together
    
    Change-Id: I0055000d1c92096c320ad52d553a7bdc19fcc025

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index cfa4496e96c6..2ecbf8eeb119 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -34,11 +34,12 @@
 #define STR_POOLCHR_JUMPEDIT                    NC_("STR_POOLCHR_JUMPEDIT", "Placeholder")
 #define STR_POOLCHR_TOXJUMP                     NC_("STR_POOLCHR_TOXJUMP", "Index Link")
 #define STR_POOLCHR_ENDNOTE                     NC_("STR_POOLCHR_ENDNOTE", "Endnote Characters")
-#define STR_POOLPAGE_LANDSCAPE                  NC_("STR_POOLPAGE_LANDSCAPE", "Landscape")
 #define STR_POOLCHR_LINENUM                     NC_("STR_POOLCHR_LINENUM", "Line Numbering")
 #define STR_POOLCHR_IDX_MAIN_ENTRY              NC_("STR_POOLCHR_IDX_MAIN_ENTRY", "Main Index Entry")
 #define STR_POOLCHR_FOOTNOTE_ANCHOR             NC_("STR_POOLCHR_FOOTNOTE_ANCHOR", "Footnote Anchor")
 #define STR_POOLCHR_ENDNOTE_ANCHOR              NC_("STR_POOLCHR_ENDNOTE_ANCHOR", "Endnote Anchor")
+#define STR_POOLCHR_RUBYTEXT                    NC_("STR_POOLCHR_RUBYTEXT", "Rubies")
+#define STR_POOLCHR_VERT_NUM                    NC_("STR_POOLCHR_VERT_NUM", "Vertical Numbering Symbols")
 // Drawing templates for HTML
 #define STR_POOLCHR_HTML_EMPHASIS               NC_("STR_POOLCHR_HTML_EMPHASIS", "Emphasis")
 #define STR_POOLCHR_HTML_CITIATION              NC_("STR_POOLCHR_HTML_CITIATION", "Quotation")
@@ -193,6 +194,7 @@
 #define STR_POOLPAGE_HTML                       NC_("STR_POOLPAGE_HTML", "HTML")
 #define STR_POOLPAGE_FOOTNOTE                   NC_("STR_POOLPAGE_FOOTNOTE", "Footnote")
 #define STR_POOLPAGE_ENDNOTE                    NC_("STR_POOLPAGE_ENDNOTE", "Endnote")
+#define STR_POOLPAGE_LANDSCAPE                  NC_("STR_POOLPAGE_LANDSCAPE", "Landscape")
 // Numbering rules
 #define STR_POOLNUMRULE_NUM1                    NC_("STR_POOLNUMRULE_NUM1", "Numbering 1")
 #define STR_POOLNUMRULE_NUM2                    NC_("STR_POOLNUMRULE_NUM2", "Numbering 2")
@@ -204,13 +206,11 @@
 #define STR_POOLNUMRULE_BUL3                    NC_("STR_POOLNUMRULE_BUL3", "List 3")
 #define STR_POOLNUMRULE_BUL4                    NC_("STR_POOLNUMRULE_BUL4", "List 4")
 #define STR_POOLNUMRULE_BUL5                    NC_("STR_POOLNUMRULE_BUL5", "List 5")
-#define STR_POOLCHR_RUBYTEXT                    NC_("STR_POOLCHR_RUBYTEXT", "Rubies")
 #define STR_COLUMN_VALUESET_ITEM0               NC_("STR_COLUMN_VALUESET_ITEM0", "1 column")
 #define STR_COLUMN_VALUESET_ITEM1               NC_("STR_COLUMN_VALUESET_ITEM1", "2 columns with equal size")
 #define STR_COLUMN_VALUESET_ITEM2               NC_("STR_COLUMN_VALUESET_ITEM2", "3 columns with equal size")
 #define STR_COLUMN_VALUESET_ITEM3               NC_("STR_COLUMN_VALUESET_ITEM3", "2 columns with different size (left > right)")
 #define STR_COLUMN_VALUESET_ITEM4               NC_("STR_COLUMN_VALUESET_ITEM4", "2 columns with different size (left < right)")
-#define STR_POOLCHR_VERT_NUM                    NC_("STR_POOLCHR_VERT_NUM", "Vertical Numbering Symbols")
 // Table styles
 #define STR_TABSTYLE_DEFAULT                    NC_("STR_TABSTYLE_DEFAULT", "Default Style")
 #define STR_TABSTYLE_3D                         NC_("STR_TABSTYLE_3D", "3D")