commit dee043eb6c8bc5d02fcbb7f34bfe6013623283f6
author Austin Schuh <austin.linux@gmail.com> Sun May 12 14:44:43 2024 -0700
committer Gerrit Code Review <gerrit@software.frc971.org> Sun May 12 14:44:43 2024 -0700
tree d6bf4a6585c2dcfb0715e8d8923c6fe1bf0ada72
parent 68faad0e1c25ab983995992d38cd92072bbe6236
parent e54988c65452c28a143b9aebf29ec121202a2740

Merge "Prevent aos_send from sending invalid messages"

aos/aos_send.cc

diff --git a/aos/aos_send.cc b/aos/aos_send.cc
index 980ebc7..8533f47 100644
--- a/aos/aos_send.cc
+++ b/aos/aos_send.cc
@@ -58,7 +58,14 @@
   flatbuffers::FlatBufferBuilder fbb(sender->fbb_allocator()->size(),
                                      sender->fbb_allocator());
   fbb.ForceDefaults(true);
-  fbb.Finish(aos::JsonToFlatbuffer(message_to_send, channel->schema(), &fbb));
+  flatbuffers::Offset<flatbuffers::Table> msg_offset =
+      aos::JsonToFlatbuffer(message_to_send, channel->schema(), &fbb);
+
+  if (msg_offset.IsNull()) {
+    return 1;
+  }
+
+  fbb.Finish(msg_offset);
 
   if (FLAGS_rate < 0) {
     sender->CheckOk(sender->Send(fbb.GetSize()));