Bugfix: fix inconsistent behavior for pb required fields when serializing and deserializing (#67)

helloopenworld · web-flow · commit a73c1c23e16b · 2023-10-27T09:22:25.000+08:00
diff --git a/trpc/serialization/pb/pb_serialization.cc b/trpc/serialization/pb/pb_serialization.cc
@@ -64,7 +64,7 @@ bool PbSerialization::Deserialize(NoncontiguousBuffer* in, DataType out_type, vo
   google::protobuf::Message* pb = static_cast<google::protobuf::Message*>(out);
   NoncontiguousBufferInputStream nbis(in);
 
-  if (TRPC_UNLIKELY(!pb->ParseFromZeroCopyStream(&nbis))) {
+  if (TRPC_UNLIKELY(!pb->ParsePartialFromZeroCopyStream(&nbis))) {
     TRPC_LOG_ERROR("pb deserialize failed");
     return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ bool PbSerialization::Deserialize(NoncontiguousBuffer* in, DataType out_type, vo`
`64`	`64`	`google::protobuf::Message* pb = static_cast<google::protobuf::Message*>(out);`
`65`	`65`	`NoncontiguousBufferInputStream nbis(in);`
`66`	`66`
`67`		`- if (TRPC_UNLIKELY(!pb->ParseFromZeroCopyStream(&nbis))) {`
	`67`	`+ if (TRPC_UNLIKELY(!pb->ParsePartialFromZeroCopyStream(&nbis))) {`
`68`	`68`	`TRPC_LOG_ERROR("pb deserialize failed");`
`69`	`69`	`return false;`
`70`	`70`	`}`