feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Fixed memory alignment, which made ESP8266 crash (issue #104)

Browse Source
This commit is contained in:
Benoit Blanchon
2015-09-01 22:21:50 +02:00
parent 823a172681
commit 5a4d993f7d
7 changed files with 51 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/DynamicJsonBuffer_Basic_Tests.cpp
View File

@ -22,9 +22,9 @@ TEST_F(DynamicJsonBuffer_Basic_Tests, InitialSizeIsZero) {
TEST_F(DynamicJsonBuffer_Basic_Tests, SizeIncreasesAfterAlloc) {
buffer.alloc(1);
ASSERT_EQ(1, buffer.size());
ASSERT_LE(1, buffer.size());
buffer.alloc(1);
ASSERT_EQ(2, buffer.size());
ASSERT_LE(2, buffer.size());
}
TEST_F(DynamicJsonBuffer_Basic_Tests, ReturnDifferentPointer) {
@ -32,3 +32,12 @@ TEST_F(DynamicJsonBuffer_Basic_Tests, ReturnDifferentPointer) {
void* p2 = buffer.alloc(2);
ASSERT_NE(p1, p2);
}
TEST_F(DynamicJsonBuffer_Basic_Tests, Alignment) {
size_t mask = sizeof(void*) - 1;
for (size_t size = 1; size <= sizeof(void*); size++) {
size_t addr = reinterpret_cast<size_t>(buffer.alloc(1));
ASSERT_EQ(0, addr & mask);
}
}