Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bytesting test broken on 32b systems #266

Merged
merged 2 commits into from
Jan 8, 2023
Merged

Fix bytesting test broken on 32b systems #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c675433
Fix bytesting test broken on 32b systems
PJK Jan 8, 2023
0885bfd
Update tests, add changelog
PJK Jan 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Template:

Next
---------------------
- [Fixed minor test bug causing failures for x86 Linux](https://github.com/PJK/libcbor/pull/266) (discovered by [trofi](https://github.com/PJK/libcbor/issues/263))
- Actual libcbor functionality not affected, bug was in the test suite

0.10.1 (2022-12-30)
---------------------
Expand Down
23 changes: 6 additions & 17 deletions test/cbor_serialize_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,27 +159,17 @@ static void test_serialize_indefinite_bytestring(void **_CBOR_UNUSED(_state)) {
cbor_decref(&item);
}

static void test_serialize_4b_bytestring(void **_CBOR_UNUSED(_state)) {
cbor_item_t *item = cbor_new_definite_bytestring();

// Fake having a huge chunk of data
unsigned char *data = malloc(1);
cbor_bytestring_set_handle(item, data, UINT32_MAX);

assert_size_equal(cbor_serialize(item, buffer, 512), 0);
assert_size_equal(cbor_serialized_size(item), (uint64_t)UINT32_MAX + 5);
cbor_decref(&item);
}

static void test_serialize_8b_bytestring(void **_CBOR_UNUSED(_state)) {
static void test_serialize_bytestring_size_overflow(
void **_CBOR_UNUSED(_state)) {
cbor_item_t *item = cbor_new_definite_bytestring();

// Fake having a huge chunk of data
unsigned char *data = malloc(1);
cbor_bytestring_set_handle(item, data, (uint64_t)UINT32_MAX + 1);
cbor_bytestring_set_handle(item, data, SIZE_MAX);

// Would require 1 + 8 + SIZE_MAX bytes, which overflows size_t
assert_size_equal(cbor_serialize(item, buffer, 512), 0);
assert_size_equal(cbor_serialized_size(item), (uint64_t)UINT32_MAX + 1 + 9);
assert_size_equal(cbor_serialized_size(item), 0);
cbor_decref(&item);
}

Expand Down Expand Up @@ -645,8 +635,7 @@ int main(void) {
cmocka_unit_test(test_serialize_negint64),
cmocka_unit_test(test_serialize_definite_bytestring),
cmocka_unit_test(test_serialize_indefinite_bytestring),
cmocka_unit_test(test_serialize_4b_bytestring),
cmocka_unit_test(test_serialize_8b_bytestring),
cmocka_unit_test(test_serialize_bytestring_size_overflow),
cmocka_unit_test(test_serialize_bytestring_no_space),
cmocka_unit_test(test_serialize_indefinite_bytestring_no_space),
cmocka_unit_test(test_serialize_definite_string),
Expand Down