From db64bd100e2f2cdd37f44e35aca8d0eae20943f8 Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Mon, 4 Mar 2019 20:23:17 +0200 Subject: [PATCH] Bugfix: Protobuf length prefix was assumed to be 1 byte The error in the code was that the `vsizeof(n)` was called with a dummy zeroed variable, instead of the proper size of the buffer. This resulted in an assertion failure when the prefix length needs to be stored in more than 1 byte. --- libp2p/protobuf/minprotobuf.nim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libp2p/protobuf/minprotobuf.nim b/libp2p/protobuf/minprotobuf.nim index 5cf5b45b0..74e6736bb 100644 --- a/libp2p/protobuf/minprotobuf.nim +++ b/libp2p/protobuf/minprotobuf.nim @@ -176,12 +176,12 @@ proc write*(pb: var ProtoBuffer, field: ProtoField) = proc finish*(pb: var ProtoBuffer) = ## Prepare protobuf's buffer ``pb`` for writing to stream. - var length = 0 assert(len(pb.buffer) > 0) if WithVarintLength in pb.options: let size = uint(len(pb.buffer) - 10) - let pos = 10 - vsizeof(length) - let res = PB.putUVarint(pb.buffer.toOpenArray(pos, 9), length, size) + let pos = 10 - vsizeof(size) + var usedBytes = 0 + let res = PB.putUVarint(pb.buffer.toOpenArray(pos, 9), usedBytes, size) assert(res == VarintStatus.Success) pb.offset = pos else: