Repository navigation
Fix DCHECK(handle) crash in CefMessageRouter.cancelPending(null, null) - #39
Merged
Merged
Conversation
3 tasks done
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #39 +/- ##
============================================
+ Coverage 38.01% 38.50% +0.49%
- Complexity 735 742 +7
============================================
Files 243 244 +1
Lines 14863 14882 +19
Branches 2449 2450 +1
============================================
+ Hits 5650 5731 +81
+ Misses 8011 7938 -73
- Partials 1202 1213 +11 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
1 of 2 tasks
Thrameos
added a commit
that referenced
this pull request
Sep 5, 2026
preliminary update racing ahead of onBeforeDownload CefDownloadItemTest.cancelDuringDownloadInvokesNCancel() flaked intermittently in CI across multiple unrelated backport PRs (#38, #39, #41, #42), always failing the same assertion: "onBeforeDownload was never invoked". Root-caused by reproducing it locally (100% deterministic once a low-risk, narrowly-scoped repro was possible -- see PR #44's run_tests.sh fix, needed first to run just this one test without also running the whole suite + leak-sweep) and adding temporary native fprintf instrumentation (not included in this commit) at DownloadHandler::OnBeforeDownload/ OnDownloadUpdated and ClientHandler::GetDownloadHandler. That instrumentation showed CEF can deliver a preliminary OnDownloadUpdated() notification -- for a valid, real CefDownloadItem -- *before* OnBeforeDownload() has been dispatched to the handler at all. This test's onDownloadUpdated() used to treat "not complete" on the very first update it saw as "must actively cancel it", immediately calling callback.cancel() and terminateTest() -- racing ahead of onBeforeDownload and ending the test before it ever got a chance to run, which is exactly what "onBeforeDownload was never invoked" captures. Fix: ignore any onDownloadUpdated() notification that arrives before this handler's own onBeforeDownload() has recorded its decision (gotBeforeDownload[0]). Verified via direct reproduction: failed 3/3 in isolation before the fix (including against a heavily-used local CEF profile where it failed 100% of the time), passed cleanly every time after (5+ consecutive solo runs, plus the full class together) with no change to downloadCompletesAndWritesRealFile's behavior. Co-Authored-By: Claude Sonnet 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01HBFmQs6JDypYP5qdC99yDq
CefMessageRouter_N.cpp's local GetHandler() unconditionally constructed a ScopedJNIObject over jrouterHandler before checking it, even though cancelPending()'s own Javadoc documents the handler as nullable. That constructor DCHECKs its handle is non-null, so a null handler crashed the process. GetJNIBrowser()/GetCefFromJNIObject_sync() already null-checks its own argument, so only the routerHandler side needed the guard. Adds CefMessageRouterTest with a regression case exercising cancelPending(null, null). Verified against a full local suite run: 125/125 passing. Co-Authored-By: Claude Sonnet 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01HBFmQs6JDypYP5qdC99yDq
Thrameos
force-pushed
the
backport/message-router-cancelpending-null
branch
from
September 5, 2026 21:23
69b402e to
4d33800
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
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.
Summary
CefMessageRouter_N.cpp's localGetHandler()unconditionally constructed aScopedJNIObjectoverjrouterHandlerbefore checking it, even thoughcancelPending()'s own Javadoc documents the handler as nullable.DCHECKs its handle is non-null, so a null handler crashed the process.GetJNIBrowser()/GetCefFromJNIObject_sync()already null-checks its own argument, so only therouterHandlerside needed the guard. Fixed by short-circuitingGetHandler()on a null handle before it ever reachesScopedJNIObject's non-null-handle constructor.Test plan
CefMessageRouterTestwith a regression case exercisingcancelPending(null, null)(the crashing input).libjcef.socleanly (ninja jcef), zero compile errors.Small, focused backport of a single self-contained fix (no other changes bundled in), following the same shape as PR #1, #36, #37, #38.
🤖 Generated with Claude Code
https://claude.ai/code/session_01HBFmQs6JDypYP5qdC99yDq