check decode return in C++ wrappers

dronecan · Feb 10, 2024 · 0ae477b · 0ae477b
1 parent e03112f
commit 0ae477b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/canard/service_client.h b/canard/service_client.h
@@ -68,7 +68,10 @@ class Client : public HandlerList, public Sender {
     /// @param transfer transfer object of the request
     void handle_message(const CanardRxTransfer& transfer) override {
         rsptype msg {};
-        rsptype::cxx_iface::rsp_decode(&transfer, &msg);
+        if (rsptype::cxx_iface::rsp_decode(&transfer, &msg)) {
+            // invalid decode
+            return;
+        }
 
         // scan through the list of entries for corresponding server node id and transfer id
         Client<rsptype>* entry = branch_head[index];

diff --git a/canard/service_server.h b/canard/service_server.h
@@ -51,7 +51,10 @@ class Server : public HandlerList {
     /// @param transfer transfer object of the request
     void handle_message(const CanardRxTransfer& transfer) override {
         reqtype msg {};
-        reqtype::cxx_iface::req_decode(&transfer, &msg);
+        if (reqtype::cxx_iface::req_decode(&transfer, &msg)) {
+            // invalid decode
+            return;
+        }
         transfer_id = transfer.transfer_id;
         // call the registered callback
         cb(transfer, msg);

diff --git a/canard/subscriber.h b/canard/subscriber.h
@@ -71,7 +71,10 @@ class Subscriber : public HandlerList {
     /// @param transfer transfer object
     void handle_message(const CanardRxTransfer& transfer) override {
         msgtype msg {};
-        msgtype::cxx_iface::decode(&transfer, &msg);
+        if (msgtype::cxx_iface::decode(&transfer, &msg)) {
+            // invalid decode
+            return;
+        }
         // call all registered callbacks in one go
         Subscriber<msgtype>* entry = branch_head[index];
         while (entry != nullptr) {