vendor/lldb/lldb-r241361

1 files changed, 8 insertions, 2 deletions

diff --git a/source/Breakpoint/BreakpointLocationCollection.cpp b/source/Breakpoint/BreakpointLocationCollection.cpp
index 5756ccedfaa4..5b6e746f911d 100644
--- a/source/Breakpoint/BreakpointLocationCollection.cpp
+++ b/source/Breakpoint/BreakpointLocationCollection.cpp
@@ -138,11 +138,17 @@ bool
 BreakpointLocationCollection::ShouldStop (StoppointCallbackContext *context)
 {
     bool shouldStop = false;
-    const size_t count = GetSize();
-    for (size_t i = 0; i < count; i++) 
+    size_t i = 0;
+    size_t prev_size = GetSize();
+    while (i < prev_size)
     {
+        // ShouldStop can remove the breakpoint from the list
         if (GetByIndex(i)->ShouldStop(context))
             shouldStop = true;
+
+        if (prev_size == GetSize())
+            i++;
+        prev_size = GetSize();
     }
     return shouldStop;
 }