Merge pull request swiftlang#9706 from adrian-prantl/cherry-pick-swift-release-6.1-lldb-Fix-off-by-one-in-array-index-check-in-Objective-C-runtime-plugin-118995

adrian-prantl · web-flow · commit 7c953db0bb23 · 2024-12-09T08:43:09.000-08:00
[Cherry-pick into swift/release/6.1] [lldb] Fix off by one in array index check in Objective C runtime plugin (llvm#118995)
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -3291,7 +3291,7 @@ bool AppleObjCRuntimeV2::NonPointerISACache::EvaluateNonPointerISA(
       }
 
       // If the index is still out of range then this isn't a pointer.
-      if (index > m_indexed_isa_cache.size())
+      if (index >= m_indexed_isa_cache.size())
         return false;
 
       LLDB_LOGF(log, "AOCRT::NPI Evaluate(ret_isa = 0x%" PRIx64 ")",

Original file line number	Diff line number	Diff line change
`@@ -3291,7 +3291,7 @@ bool AppleObjCRuntimeV2::NonPointerISACache::EvaluateNonPointerISA(`
`3291`	`3291`	`}`
`3292`	`3292`
`3293`	`3293`	`// If the index is still out of range then this isn't a pointer.`
`3294`		`- if (index > m_indexed_isa_cache.size())`
	`3294`	`+ if (index >= m_indexed_isa_cache.size())`
`3295`	`3295`	`return false;`
`3296`	`3296`
`3297`	`3297`	`LLDB_LOGF(log, "AOCRT::NPI Evaluate(ret_isa = 0x%" PRIx64 ")",`