[protobuf] Readded msg_size and field name check to ProcProtoMsg recu…

…rsion (#1734) (#1735) * Added msg_size and string find check to ProcProtoMsg recursion. * Added same logic to dyn_proto sample Co-authored-by: Peguen <[email protected]>
eclipse-ecal · Oct 2, 2024 · 054c30b · 054c30b
1 parent 9e989cb
commit 054c30b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/contrib/ecalproto/src/ecal_proto_decoder.cpp b/contrib/ecalproto/src/ecal_proto_decoder.cpp
@@ -271,7 +271,8 @@ namespace protobuf
                 std::vector<const google::protobuf::FieldDescriptor*> msg_fields;
                 msg.GetReflection()->ListFields(msg, &msg_fields);
 
-                ProcProtoMsg(msg, name.str(), complete_message_name, true, fnum);
+                if (prefix_.find(field->name()) == std::string::npos || !msg_fields.empty())
+                  ProcProtoMsg(msg, name.str(), complete_message_name, true, fnum);
               }
             }
           }
@@ -282,8 +283,9 @@ namespace protobuf
             // do not process default messages to avoid infinite recursions.
             std::vector<const google::protobuf::FieldDescriptor*> msg_fields;
             msg.GetReflection()->ListFields(msg, &msg_fields);
-
-            ProcProtoMsg(msg, field->name(), complete_message_name, false, field->number());
+
+            if (prefix_.find(field->name()) == std::string::npos || !msg_fields.empty())
+              ProcProtoMsg(msg, field->name(), complete_message_name, false, field->number());
           }
         }
         break;

diff --git a/samples/cpp/pubsub/protobuf/proto_dyn/src/proto_dyn.cpp b/samples/cpp/pubsub/protobuf/proto_dyn/src/proto_dyn.cpp
@@ -244,7 +244,8 @@ void ProcProtoMsg(const google::protobuf::Message& msg_, const std::string& pref
               std::vector<const google::protobuf::FieldDescriptor*> msg_fields;
               msg.GetReflection()->ListFields(msg, &msg_fields);
 
-              ProcProtoMsg(msg, prefix);
+              if (prefix_.find(field->name()) == std::string::npos || !msg_fields.empty())
+                ProcProtoMsg(msg, prefix);
             }
           }
           else
@@ -257,7 +258,8 @@ void ProcProtoMsg(const google::protobuf::Message& msg_, const std::string& pref
             std::vector<const google::protobuf::FieldDescriptor*> msg_fields;
             msg.GetReflection()->ListFields(msg, &msg_fields);
 
-            ProcProtoMsg(msg, prefix);
+            if (prefix_.find(field->name()) == std::string::npos || !msg_fields.empty())
+              ProcProtoMsg(msg, prefix);
           }
         }
         break;