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

Matúš Kukan matus.kukan at collabora.com
Tue Dec 23 12:55:23 PST 2014


 sc/source/ui/unoobj/fmtuno.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa568d94112ff44caabf9f7e27dd52af4b3813b3
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 23 21:26:35 2014 +0100

    Don't crash when nIndex < 0
    
    Change-Id: I24ba4365d9d5f78e875ea51382c6b1f864b2e5fe
    (cherry picked from commit e225b0925b371bd33d40d97c240bd3165b628464)
    Reviewed-on: https://gerrit.libreoffice.org/13631
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 89fcd26..a9f19e9 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -349,7 +349,7 @@ void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex )
 {
     SolarMutexGuard aGuard;
 
-    if (nIndex < static_cast<sal_Int32>(aEntries.size()))
+    if (nIndex < static_cast<sal_Int32>(aEntries.size()) && nIndex >= 0)
     {
         std::vector<ScTableConditionalEntry*>::iterator iter = aEntries.begin()+nIndex;
 


More information about the Libreoffice-commits mailing list