commit 1fbe427b41f7f3c0fa25de7c8b05d6ee9cb491ab
author Ryan Savitski <rsavitski@google.com> Tue May 25 14:10:39 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 25 14:10:39 2021 +0000
tree 8f59e4cb678e1df2eea1fc479ec85b94f0536cb6
parent 8564f6f6d81270ec2306a2c5ee3697ef0366d3ae
parent 8083765f2814e3f19a35b410e389fa1814a81c92

Merge "tracing_service: reject entire session if a DS has an out of bounds target_buffer"

src/trace_processor/importers/proto/track_event_parser.cc

diff --git a/src/trace_processor/importers/proto/track_event_parser.cc b/src/trace_processor/importers/proto/track_event_parser.cc
index 7926bd3..6be84c5 100644
--- a/src/trace_processor/importers/proto/track_event_parser.cc
+++ b/src/trace_processor/importers/proto/track_event_parser.cc
@@ -110,6 +110,8 @@
   }
   bool AddJson(const Key& key, const protozero::ConstChars& value) final {
     auto json_value = json::ParseJsonString(value);
+    if (!json_value)
+      return false;
     return json::AddJsonValueToArgs(*json_value, base::StringView(key.flat_key),
                                     base::StringView(key.key), &storage_,
                                     &inserter_);