Fixed a bug limiting the extent of removeRange in ReferenceCountedArray

juce-framework · Sep 21, 2018 · bd211ce · bd211ce
1 parent 9fd0e53
commit bd211ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/modules/juce_core/containers/juce_Array.h b/modules/juce_core/containers/juce_Array.h
@@ -871,10 +871,11 @@ class Array
 
         auto endIndex = jlimit (0, values.size(), startIndex + numberToRemove);
         startIndex    = jlimit (0, values.size(), startIndex);
+        numberToRemove = endIndex - startIndex;
 
-        if (endIndex > startIndex)
+        if (numberToRemove > 0)
         {
-            values.removeElements (startIndex, endIndex - startIndex);
+            values.removeElements (startIndex, numberToRemove);
             minimiseStorageAfterRemoval();
         }
     }

diff --git a/modules/juce_core/containers/juce_OwnedArray.h b/modules/juce_core/containers/juce_OwnedArray.h
@@ -606,7 +606,7 @@ class OwnedArray
         startIndex = jlimit (0, values.size(), startIndex);
         numberToRemove = endIndex - startIndex;
 
-        if (endIndex > startIndex)
+        if (numberToRemove > 0)
         {
             if (deleteObjects)
             {

diff --git a/modules/juce_core/containers/juce_ReferenceCountedArray.h b/modules/juce_core/containers/juce_ReferenceCountedArray.h
@@ -650,12 +650,13 @@ class ReferenceCountedArray
                       int numberToRemove)
     {
         const ScopedLockType lock (getLock());
-        auto start    = jlimit (0, values.size(), startIndex);
+        startIndex    = jlimit (0, values.size(), startIndex);
         auto endIndex = jlimit (0, values.size(), startIndex + numberToRemove);
+        numberToRemove = endIndex - startIndex;
 
-        if (endIndex > start)
+        if (numberToRemove > 0)
         {
-            for (int i = start; i < endIndex; ++i)
+            for (int i = startIndex; i < endIndex; ++i)
             {
                 releaseObject (values[i]);
                 values[i] = nullptr; // (in case one of the destructors accesses this array and hits a dangling pointer)