vacp2p
/
nim-libp2p
mirror of https://github.com/vacp2p/nim-libp2p.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Zahary Karadjov 2019-03-04 20:23:17 +02:00
parent e6c424618d
commit db64bd100e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libp2p/protobuf/minprotobuf.nim
View File

@ -176,12 +176,12 @@ proc write*(pb: var ProtoBuffer, field: ProtoField) =
proc finish*(pb: var ProtoBuffer) = proc finish*(pb: var ProtoBuffer) =
## Prepare protobuf's buffer ``pb`` for writing to stream. ## Prepare protobuf's buffer ``pb`` for writing to stream.
var length = 0
assert(len(pb.buffer) > 0) assert(len(pb.buffer) > 0)
if WithVarintLength in pb.options: if WithVarintLength in pb.options:
let size = uint(len(pb.buffer) - 10) let size = uint(len(pb.buffer) - 10)
let pos = 10 - vsizeof(length) let pos = 10 - vsizeof(size)
let res = PB.putUVarint(pb.buffer.toOpenArray(pos, 9), length, size) var usedBytes = 0
let res = PB.putUVarint(pb.buffer.toOpenArray(pos, 9), usedBytes, size)
assert(res == VarintStatus.Success) assert(res == VarintStatus.Success)
pb.offset = pos pb.offset = pos
else: else: