CFRunLoop: search the sources array with its own count when removing invalidated sources#63
Open
DTW-Thalion wants to merge 1 commit into
Open
Conversation
HendrikHuebner
approved these changes
Jul 3, 2026
|
|
||
| /* CFRunLoopSourceRemoveInvalidated searched the sources0 array using the | ||
| * count of the timers array, so with no timers the search range was (0, 0) | ||
| * and an invalidated source was never removed from the run loop. */ |
CFRunLoopSourceRemoveInvalidated searched ctxt->sources0 using the count of ctxt->timers. With no timers the search range was (0, 0), so an invalidated version-0 source was never found and never removed from the run loop; with more timers than sources the range ran past the end of the sources array. Use CFArrayGetCount(ctxt->sources0), matching the timer path. Add Tests/CFRunLoop/source_invalidate.m.
DTW-Thalion
force-pushed
the
fix/cfrunloop-source-remove
branch
from
c3f9cc7 to
24f394f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
CFRunLoopSourceRemoveInvalidatedsearched thesources0array using thecount of the timers array:
With no timers registered the search range was
(0, 0), so an invalidatedversion-0 source was never found and never removed from the run loop (it also
stayed in
sources0set, soCFRunLoopContainsSourcekept returning true). Whenthere were more timers than sources, the range ran past the end of the
sources0array.Fix
Use
CFArrayGetCount(ctxt->sources0), matching the timer-removal path(
CFRunLoopTimerRemoveInvalidated).Test
Tests/CFRunLoop/source_invalidate.m: add a version-0 source (no timers),invalidate it, and confirm
CFRunLoopContainsSourcereturns false.