diff --git a/lldb/source/Target/ThreadPlanRunToAddress.cpp b/lldb/source/Target/ThreadPlanRunToAddress.cpp
index 2dc9daa2e65a..23945453f00f 100644
--- a/lldb/source/Target/ThreadPlanRunToAddress.cpp
+++ b/lldb/source/Target/ThreadPlanRunToAddress.cpp
@@ -247,7 +247,8 @@ ThreadPlanRunToAddress::AtOurAddress ()
 {
     lldb::addr_t current_address = m_thread.GetRegisterContext()->GetPC();
     bool found_it = false;
-    for (size_t i = 0; i < m_addresses[i]; i++)
+    size_t num_addresses = m_addresses.size();
+    for (size_t i = 0; i < num_addresses; i++)
     {
         if (m_addresses[i] == current_address)
         {