Return Unavailable status if not able to parse request (#254)

ni · May 8, 2023 · 058070d · 058070d
1 parent 8de8fb6
commit 058070d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/event_data.cc b/src/event_data.cc
@@ -199,12 +199,19 @@ namespace grpc_labview
                 auto responseMetadata = _server->FindMetadata(eventData.responseMetadataName);
                 _request = std::make_shared<LVMessage>(requestMetadata);
                 _response = std::make_shared<LVMessage>(responseMetadata);
-                _request->ParseFromByteBuffer(_rb);
-                _requestDataReady = true;
 
-                _methodData = std::make_shared<GenericMethodData>(this, &_ctx, _request, _response);
-                gPointerManager.RegisterPointer(_methodData);
-                _server->SendEvent(name, static_cast<gRPCid*>(_methodData.get()));
+                if (_request->ParseFromByteBuffer(_rb))
+                {
+                    _requestDataReady = true;
+                    _methodData = std::make_shared<GenericMethodData>(this, &_ctx, _request, _response);
+                    gPointerManager.RegisterPointer(_methodData);
+                    _server->SendEvent(name, static_cast<gRPCid*>(_methodData.get()));
+                }
+                else
+                {
+                    _status = CallStatus::Finish;
+                    _stream.Finish(grpc::Status(grpc::StatusCode::UNAVAILABLE, ""), this);
+                }
             }
             else
             {

diff --git a/src/lv_message.cc b/src/lv_message.cc
@@ -165,6 +165,10 @@ namespace grpc_labview
                 }
                 else
                 {
+                    if (tag == 0 || WireFormatLite::GetTagWireType(tag) == WireFormatLite::WIRETYPE_END_GROUP) {
+                        ctx->SetLastTag(tag);
+                        return ptr;
+                    }
                     ptr = UnknownFieldParse(tag, &_unknownFields, ptr, ctx);
                     assert(ptr != nullptr);
                 }