diff options
Diffstat (limited to 'src/components/protocol_handler/src/protocol_payload.cc')
-rw-r--r-- | src/components/protocol_handler/src/protocol_payload.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/components/protocol_handler/src/protocol_payload.cc b/src/components/protocol_handler/src/protocol_payload.cc index acc6825b36..9fb77c81ee 100644 --- a/src/components/protocol_handler/src/protocol_payload.cc +++ b/src/components/protocol_handler/src/protocol_payload.cc @@ -40,11 +40,11 @@ namespace { // Protocol header field sizes static const size_t kRpcTypeBits = 4; static const size_t kRpcFunctionIdBits = 32 - kRpcTypeBits; -static const size_t kCorellationIdBits = 32; +static const size_t kCorrelationIdBits = 32; static const size_t kJsonSizeBits = 32; static const size_t PayloadHeaderBits = kRpcTypeBits + kRpcFunctionIdBits + - kCorellationIdBits + + kCorrelationIdBits + kJsonSizeBits; } @@ -52,7 +52,7 @@ namespace protocol_handler { void Extract(utils::BitStream *bs, ProtocolPayloadHeaderV2 *headerv2) { DCHECK(bs && headerv2); - if (*bs) { + if (headerv2 && bs && *bs) { uint8_t rpc_type; utils::Extract(bs, &rpc_type, kRpcTypeBits); headerv2->rpc_type = RpcTypeFromByte(rpc_type); @@ -61,7 +61,7 @@ void Extract(utils::BitStream *bs, ProtocolPayloadHeaderV2 *headerv2) { return; } utils::Extract(bs, &headerv2->rpc_function_id, kRpcFunctionIdBits); - utils::Extract(bs, &headerv2->corellation_id); // kCorellationIdBits + utils::Extract(bs, &headerv2->correlation_id); // kCorrelationIdBits utils::Extract(bs, &headerv2->json_size); // kJsonSizeBits } } @@ -69,12 +69,11 @@ void Extract(utils::BitStream *bs, ProtocolPayloadHeaderV2 *headerv2) { void Extract(utils::BitStream *bs, ProtocolPayloadV2 *payload, size_t payload_size) { DCHECK(bs && payload); - if (*bs) { + if (payload && bs && *bs) { Extract(bs, &payload->header); utils::Extract(bs, &payload->json, payload->header.json_size); size_t data_size = payload_size - payload->header.json_size - PayloadHeaderBits / CHAR_BIT; - DCHECK(data_size < payload_size); utils::Extract(bs, &payload->data, data_size); } } @@ -83,8 +82,8 @@ std::ostream &operator<<(std::ostream &os, const ProtocolPayloadHeaderV2 &payload_header) { return os << "(ProtocolPayloadHeaderV2" << " rpc_type: " << payload_header.rpc_type << ", rpc_function_id: " - << payload_header.rpc_function_id << ", corellation_id: " - << payload_header.corellation_id << ", json_size: " + << payload_header.rpc_function_id << ", correlation_id: " + << payload_header.correlation_id << ", json_size: " << payload_header.json_size << ")"; } |