Track coffeecatch master instead of the ucontext fix branch - #75
Merged
Conversation
The pointer was on the fix-i386-ucontext-redef branch; that fix is upstream now, so track master. Notable for Android: the old signal handler is dispatched on SA_SIGINFO rather than NULL-ness, a fault inside the unwinder no longer recurses, and the reentry count stays balanced when a signal collapses nested COFFEE_TRY blocks. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Xavier Roche <roche@httrack.com>
xroche
added a commit
that referenced
this pull request
Jul 25, 2026
Internal release carrying the coffeecatch bump (#75): the crash handler now picks the old signal handler by SA_SIGINFO and guards against a fault inside the unwinder. Engine unchanged at 3.49.14, so only build.gradle moves. Signed-off-by: Xavier Roche <roche@httrack.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Points the coffeecatch submodule at upstream master. It was pinned to the
fix-i386-ucontext-redefbranch because the legacy ucontext block wouldn't build on x86_64; that fix landed upstream in xroche/coffeecatch#49, so the branch pin is no longer needed.Nineteen commits of crash-handler hardening come with it. What matters here: the old signal handler is now picked by
SA_SIGINFOinstead of by NULL-ness, a nestedsiglongjmpguard keeps a fault inside the unwinder from recursing, and the reentry count stays balanced when a signal collapses nestedCOFFEE_TRYblocks.assembleDebugbuilds for both ABIs;libhtslibjni.solinks clean under-Werrorand exportscoffeecatch_reenteron arm64-v8a and x86_64.