Skip to content

debugger: if controller has been disposed, leave showScriptLocation early #9884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srawlins merged 2 commits into from
Jul 10, 2026
Merged

debugger: if controller has been disposed, leave showScriptLocation early #9884

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddaadd8
debugger: if controller has been disposed, leave showScriptLocation e…
srawlins Jul 9, 2026
f81d7e5
more short circuits
srawlins Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/devtools_app/lib/src/screens/debugger/codeview_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ class CodeViewController extends DisposableController
);

if (succeeded) {
// The controller may have been disposed while awaiting the asynchronous
// location display setup.
if (disposed) return;
Comment thread
srawlins marked this conversation as resolved.
// Update the scripts history (and make sure we don't react to the
// subsequent event).
scriptsHistory.current.removeListener(_scriptHistoryListener);
Expand All @@ -234,6 +237,8 @@ class CodeViewController extends DisposableController
final isolateRef =
serviceConnection.serviceManager.isolateManager.selectedIsolate.value!;
final processedReport = await _getSourceReport(isolateRef, current.script);
// The controller may have been disposed while awaiting the source report.
if (disposed) return;

parsedScript.value = ParsedScript(
script: current.script,
Expand Down Expand Up @@ -264,6 +269,8 @@ class CodeViewController extends DisposableController
if (scriptRef.id != parsedScript.value?.script.id) {
// Try to parse the script if it isn't the currently parsed script:
final script = await _parseScript(scriptRef);
// The controller may have been disposed while awaiting the script parsing.
if (disposed) return false;
if (script == null) {
// Return early and indicate failure if parsing fails.
reportError(
Expand Down
Loading