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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/timeline.cc

Issue 1402203003: Fix racey crash in TimelineDurationScope (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/timeline.cc
diff --git a/runtime/vm/timeline.cc b/runtime/vm/timeline.cc
index 6b96b167e9ee9b70e8745717333d27d785e414b7..a114c1a35359f786d372cb1c0ea673975043b75b 100644
--- a/runtime/vm/timeline.cc
+++ b/runtime/vm/timeline.cc
@@ -511,6 +511,11 @@ TimelineDurationScope::~TimelineDurationScope() {
return;
}
TimelineEvent* event = stream_->StartEvent();
+ if (event == NULL) {
+ // Stream is now disabled.
+ FreeArguments();
+ return;
+ }
ASSERT(event != NULL);
event->Duration(label_, timestamp_, OS::GetCurrentTraceMicros());
event->StealArguments(arguments_length_, arguments_);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698