Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Unified Diff: runtime/bin/dbg_message.cc

Issue 1168933002: Fixes crashes in VM isolate shutdown. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/vm/code_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/dbg_message.cc
diff --git a/runtime/bin/dbg_message.cc b/runtime/bin/dbg_message.cc
index 1d8c22c024ab9475b20c2c5b1a8ecdb81d2cff83..a6358806daca30d265fda87d03c6b66a7fc05656 100644
--- a/runtime/bin/dbg_message.cc
+++ b/runtime/bin/dbg_message.cc
@@ -1409,14 +1409,15 @@ void DbgMsgQueueList::IsolateEventHandler(Dart_IsolateId isolate_id,
msg_queue->SendIsolateEvent(isolate_id, kind);
} else {
DbgMsgQueue* msg_queue = GetIsolateMsgQueue(isolate_id);
- ASSERT(msg_queue != NULL);
- msg_queue->SendQueuedMsgs();
- msg_queue->SendIsolateEvent(isolate_id, kind);
- if (kind == kInterrupted) {
- msg_queue->MessageLoop();
- } else {
- ASSERT(kind == kShutdown);
- RemoveIsolateMsgQueue(isolate_id);
+ if (msg_queue != NULL) {
+ msg_queue->SendQueuedMsgs();
+ msg_queue->SendIsolateEvent(isolate_id, kind);
+ if (kind == kInterrupted) {
+ msg_queue->MessageLoop();
+ } else {
+ ASSERT(kind == kShutdown);
+ RemoveIsolateMsgQueue(isolate_id);
+ }
}
}
Dart_ExitScope();
« no previous file with comments | « no previous file | runtime/vm/code_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698