aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Kyostila <skyostil@google.com>2020-06-09 15:57:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-06-09 15:57:57 +0000
commit5df4a7a9dcb79093cf678506487a28fd20d6cfe4 (patch)
treef6ebc85fcd10bdbcfd2aa9aee5542f35af1a7ec4
parent3fd631b2397e20d668261b2e3acb0aa82b33049a (diff)
parent0f9a8bfe8ddb2486c2998baea8572b8bd1b10df0 (diff)
downloadperfetto-5df4a7a9dcb79093cf678506487a28fd20d6cfe4.tar.gz
Merge "tracing: Allow empty call to OnTraceData"
-rw-r--r--src/tracing/internal/tracing_muxer_impl.cc2
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);