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);
}
}

56
test/Issue104.cpp
View File

@ -1,56 +0,0 @@
// Copyright Benoit Blanchon 2014-2015
// MIT License
//
// Arduino JSON library
// https://github.com/bblanchon/ArduinoJson
#include <gtest/gtest.h>
#define ARDUINOJSON_ENABLE_STD_STREAM
#include <ArduinoJson.h>
#define SOURCE "{\"mqtt.host\":\"mqtt.test.com\",\"mqtt.port\":1883}"
#define SIZE_WITH_COPY (sizeof(SOURCE) + JSON_OBJECT_SIZE(2))
#define SIZE_WITHOUT_COPY (JSON_OBJECT_SIZE(2))
template <int N, typename S>
void mustSucceedWith(S source) {
StaticJsonBuffer<N> jsonBuffer;
ASSERT_TRUE(jsonBuffer.parseObject(source).success());
}
template <int N, typename S>
void mustFailWith(S source) {
StaticJsonBuffer<N> jsonBuffer;
ASSERT_FALSE(jsonBuffer.parseObject(source).success());
}
TEST(Issue104, CharPtrSucceeds) {
char source[] = SOURCE;
mustSucceedWith<SIZE_WITHOUT_COPY, char *>(source);
}
TEST(Issue104, CharPtrFails) {
char source[] = SOURCE;
mustFailWith<SIZE_WITHOUT_COPY - 1, char *>(source);
}
TEST(Issue104, ConstCharPtrSucceeds) {
mustSucceedWith<SIZE_WITH_COPY, const char *>(SOURCE);
}
TEST(Issue104, ConstCharPtrFails) {
mustFailWith<SIZE_WITH_COPY - 1, const char *>(SOURCE);
}
TEST(Issue104, StringSucceeds) {
mustSucceedWith<SIZE_WITH_COPY, const String &>(SOURCE);
}
TEST(Issue104, StringFails) {
mustFailWith<SIZE_WITH_COPY - 1, const String &>(SOURCE);
}
TEST(Issue104, TooSmallForStrDup) {
mustFailWith<sizeof(SOURCE) - 1, const char *>(SOURCE);
}

29
test/StaticJsonBuffer_Basic_Tests.cpp
View File

@ -13,11 +13,11 @@ using namespace ArduinoJson;
class StaticJsonBuffer_Basic_Tests : public testing::Test {
protected:
StaticJsonBuffer<42> buffer;
StaticJsonBuffer<64> buffer;
};
TEST_F(StaticJsonBuffer_Basic_Tests, CapacityMatchTemplateParameter) {
ASSERT_EQ(42, buffer.capacity());
ASSERT_EQ(64, buffer.capacity());
}
TEST_F(StaticJsonBuffer_Basic_Tests, InitialSizeIsZero) {
@ -26,34 +26,43 @@ TEST_F(StaticJsonBuffer_Basic_Tests, InitialSizeIsZero) {
TEST_F(StaticJsonBuffer_Basic_Tests, GrowsAfterAlloc) {
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(StaticJsonBuffer_Basic_Tests, DoesntGrowWhenFull) {
buffer.alloc(42);
buffer.alloc(64);
buffer.alloc(1);
ASSERT_EQ(42, buffer.size());
ASSERT_EQ(64, buffer.size());
}
TEST_F(StaticJsonBuffer_Basic_Tests, DoesntGrowWhenTooSmall) {
buffer.alloc(43);
buffer.alloc(65);
ASSERT_EQ(0, buffer.size());
}
TEST_F(StaticJsonBuffer_Basic_Tests, ReturnsNonNull) {
void *p = buffer.alloc(42);
void *p = buffer.alloc(64);
ASSERT_NE(static_cast<void *>(0), p);
}
TEST_F(StaticJsonBuffer_Basic_Tests, ReturnsNullWhenFull) {
buffer.alloc(42);
buffer.alloc(64);
void *p = buffer.alloc(1);
ASSERT_EQ(NULL, p);
}
TEST_F(StaticJsonBuffer_Basic_Tests, ReturnsNullWhenTooSmall) {
void *p = buffer.alloc(43);
void *p = buffer.alloc(65);
ASSERT_EQ(NULL, p);
}
TEST_F(StaticJsonBuffer_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);
}
}