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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3bd5680f7c71c5a6a8829f2b19d92744d7cbb56a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 7 10:31:46 2018 +0300

    Fix off-by-one error: The XCollection loop index is one-based
    
    We must compare the index against the number of entries with '>' and
    not '>='.
    
    Change-Id: I2de9e53b2a0d923d4136ee5e093baa955c8301da
    Reviewed-on: https://gerrit.libreoffice.org/55405
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index aa160fa1141a..ca31169b1b6f 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2069,7 +2069,7 @@ public:
         ULONG nReturned = 0;
         while (nLeft > 0)
         {
-            if (mnIndex >= mxCollection->getCount())
+            if (mnIndex > mxCollection->getCount())
             {
                 SAL_INFO("extensions.olebridge", this << "@CXEnumVariant::Next(" << celt << "): got " << nReturned << ": S_FALSE");
                 return S_FALSE;
@@ -2104,7 +2104,7 @@ public:
         ULONG nSkipped = 0;
         while (celt > 0)
         {
-            if (mnIndex >= mxCollection->getCount())
+            if (mnIndex > mxCollection->getCount())
             {
                 SAL_INFO("extensions.olebridge", this << "@CXEnumVariant::Skip(" << celt << "): skipped " << nSkipped << ": S_FALSE");
                 return S_FALSE;