aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 23:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

bigsize: insist in minimal representation in bigsize_get().

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-07-30 14:55:12 +09:30
parent 3fa375881a
commit 8349c1a0c2
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/bigsize.c
View File

@@ -1,5 +1,9 @@
#include <common/bigsize.h> #include <common/bigsize.h>
#ifndef SUPERVERBOSE
#define SUPERVERBOSE(...)
#endif
size_t bigsize_len(bigsize_t v) size_t bigsize_len(bigsize_t v)
{ {
if (v < 0xfd) { if (v < 0xfd) {
@@ -45,28 +49,48 @@ size_t bigsize_put(u8 buf[BIGSIZE_MAX_LEN], bigsize_t v)
size_t bigsize_get(const u8 *p, size_t max, bigsize_t *val) size_t bigsize_get(const u8 *p, size_t max, bigsize_t *val)
{ {
if (max < 1) if (max < 1) {
SUPERVERBOSE("EOF");
return 0; return 0;
}
switch (*p) { switch (*p) {
case 0xfd: case 0xfd:
if (max < 3) if (max < 3) {
SUPERVERBOSE("unexpected EOF");
return 0; return 0;
}
*val = ((u64)p[1] << 8) + p[2]; *val = ((u64)p[1] << 8) + p[2];
if (*val < 0xfd) {
SUPERVERBOSE("decoded varint is not canonical");
return 0;
}
return 3; return 3;
case 0xfe: case 0xfe:
if (max < 5) if (max < 5) {
SUPERVERBOSE("unexpected EOF");
return 0; return 0;
}
*val = ((u64)p[1] << 24) + ((u64)p[2] << 16) *val = ((u64)p[1] << 24) + ((u64)p[2] << 16)
+ ((u64)p[3] << 8) + p[4]; + ((u64)p[3] << 8) + p[4];
if ((*val >> 16) == 0) {
SUPERVERBOSE("decoded varint is not canonical");
return 0;
}
return 5; return 5;
case 0xff: case 0xff:
if (max < 9) if (max < 9) {
SUPERVERBOSE("unexpected EOF");
return 0; return 0;
}
*val = ((u64)p[1] << 56) + ((u64)p[2] << 48) *val = ((u64)p[1] << 56) + ((u64)p[2] << 48)
+ ((u64)p[3] << 40) + ((u64)p[4] << 32) + ((u64)p[3] << 40) + ((u64)p[4] << 32)
+ ((u64)p[5] << 24) + ((u64)p[6] << 16) + ((u64)p[5] << 24) + ((u64)p[6] << 16)
+ ((u64)p[7] << 8) + p[8]; + ((u64)p[7] << 8) + p[8];
if ((*val >> 32) == 0) {
SUPERVERBOSE("decoded varint is not canonical");
return 0;
}
return 9; return 9;
default: default:
*val = *p; *val = *p;