[Libreoffice-commits] core.git: sd/source

[Muhammet Kara (via logerrit)]

 sd/source/core/CustomAnimationCloner.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 8023a613e978be42758c88d23f1973f7b9661676
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sat Nov 9 00:14:11 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Fri Nov 8 23:31:16 2019 +0100

    Fix tdf#124708: CRASH: Selecting all and deleting
    
    Change-Id: I0de912dad97f266a56ab52a351b0676f17675ed5
    Reviewed-on: https://gerrit.libreoffice.org/82332
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 4fabb5117ae1..3049abb60d5c 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -282,9 +282,13 @@ namespace sd
 
     Reference< XAnimationNode > CustomAnimationClonerImpl::getClonedNode( const Reference< XAnimationNode >& xSource ) const
     {
-        sal_Int32 nNode, nNodeCount = maSourceNodeVector.size();
+        std::size_t nNodeCount = maSourceNodeVector.size();
+        std::size_t nCloneNodeCount = maCloneNodeVector.size();
 
-        for( nNode = 0; nNode < nNodeCount; nNode++ )
+        if (nNodeCount != nCloneNodeCount)
+            SAL_WARN("sd.core", "Sizes of maSourceNodeVector and maCloneNodeVector mismatch!");
+
+        for( std::size_t nNode = 0; nNode < nNodeCount && nNode < nCloneNodeCount; ++nNode )
         {
             if( maSourceNodeVector[nNode] == xSource )
                 return maCloneNodeVector[nNode];