rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect too large varint values when decoding.

Browse Source 
Because Issue #139 now allows limiting integer fields, it is good
to check the values received from other protobuf libraries against
the lower limits.
This commit is contained in:
Petteri Aimonen
2015-01-04 12:04:24 +02:00
parent 50c67ecec4
commit a0f0440394
3 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/decode_unittests/decode_unittests.c
View File

@@ -123,16 +123,16 @@ int main()
}
{
pb_istream_t s = S("\x01\xFF\xFF\x03");
pb_istream_t s = S("\x01\x00");
pb_field_t f = {1, PB_LTYPE_VARINT, 0, 0, 4, 0, 0};
uint32_t d;
COMMENT("Test pb_dec_varint using uint32_t")
TEST(pb_dec_varint(&s, &f, &d) && d == 1)
/* Verify that no more than data_size is written. */
d = 0;
d = 0xFFFFFFFF;
f.data_size = 1;
TEST(pb_dec_varint(&s, &f, &d) && (d == 0xFF || d == 0xFF000000))
TEST(pb_dec_varint(&s, &f, &d) && (d == 0xFFFFFF00 || d == 0x00FFFFFF))
}
{

14
tests/intsizes/intsizes_unittests.c
View File

@@ -101,6 +101,20 @@ int main()
INT32_MIN, 0, INT32_MIN,
INT64_MIN, 0, INT64_MIN, true);
COMMENT("Test overflow detection");
TEST_ROUNDTRIP(-129, 0, -128,
-32768, 0, -32768,
INT32_MIN, 0, INT32_MIN,
INT64_MIN, 0, INT64_MIN, false);
TEST_ROUNDTRIP(127, 256, 127,
32767, 65535, 32767,
INT32_MAX, UINT32_MAX, INT32_MAX,
INT64_MAX, UINT64_MAX, INT64_MAX, false);
TEST_ROUNDTRIP(-128, 0, -128,
-32768, 0, -32769,
INT32_MIN, 0, INT32_MIN,
INT64_MIN, 0, INT64_MIN, false);
if (status != 0)
fprintf(stdout, "\n\nSome tests FAILED!\n");