Jerry/bird
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix type mixing in flowspec formatting

Browse source 
Variable of u64 type was passed to vararg function as uint.
This commit is contained in:
Ondrej Zajicek (work) 2017-05-19 00:33:52 +02:00
parent e521150b8f
commit bb7aa06a48
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/flowspec.c
View file

@ -924,7 +924,7 @@ num_op_str(const byte *op)
return NULL; return NULL;
} }
static u64 static uint
get_value(const byte *val, u8 len) get_value(const byte *val, u8 len)
{ {
switch (len) switch (len)
@ -932,7 +932,8 @@ get_value(const byte *val, u8 len)
case 1: return *val; case 1: return *val;
case 2: return get_u16(val); case 2: return get_u16(val);
case 4: return get_u32(val); case 4: return get_u32(val);
case 8: return get_u64(val); // No component may have length 8
// case 8: return get_u64(val);
} }
return 0; return 0;
@ -974,7 +975,7 @@ net_format_flow_num(buffer *b, const byte *part)
{ {
const byte *last_op = NULL; const byte *last_op = NULL;
const byte *op = part+1; const byte *op = part+1;
u64 val; uint val;
uint len; uint len;
uint first = 1; uint first = 1;
@ -1038,7 +1039,7 @@ static void
net_format_flow_bitmask(buffer *b, const byte *part) net_format_flow_bitmask(buffer *b, const byte *part)
{ {
const byte *op = part+1; const byte *op = part+1;
u64 val; uint val;
uint len; uint len;
uint first = 1; uint first = 1;