diff options
| author | Sami Kyostila <skyostil@google.com> | 2020-06-09 16:46:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 16:46:30 +0000 |
| commit | 870dcf0e6e04c387319af34f22ef3b1087071f93 (patch) | |
| tree | 015675b655aa52f4fb94c5bcb658b1c15207dece | |
| parent | 26b1e3bef5e83dc754a5a06cd1fb408bf0d834c7 (diff) | |
| parent | ee9cf18d89a2a28f8f99782936277363146f59dd (diff) | |
| download | perfetto-870dcf0e6e04c387319af34f22ef3b1087071f93.tar.gz | |
Merge "tracing: Allow empty call to OnTraceData" am: 5df4a7a9dc am: 2b4696b365 am: ee9cf18d89
Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1325821
Change-Id: Ibd109a4978a82fb533664c11da1d0bcc6fbaff7e
| -rw-r--r-- | src/tracing/internal/tracing_muxer_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tracing/internal/tracing_muxer_impl.cc b/src/tracing/internal/tracing_muxer_impl.cc index e3e0a4348..79eb7349b 100644 --- a/src/tracing/internal/tracing_muxer_impl.cc +++ b/src/tracing/internal/tracing_muxer_impl.cc @@ -253,7 +253,7 @@ void TracingMuxerImpl::ConsumerImpl::OnTraceData( auto callback = read_trace_callback_; muxer_->task_runner_->PostTask([callback, buf, has_more] { TracingSession::ReadTraceCallbackArgs callback_arg{}; - callback_arg.data = &(*buf)[0]; + callback_arg.data = buf->size() ? &(*buf)[0] : nullptr; callback_arg.size = buf->size(); callback_arg.has_more = has_more; callback(callback_arg); |