github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

serializeMsgPack(doc, p, n) doesn't add terminator anymore (fixes #1545)

Browse Source
This commit is contained in:
Benoit Blanchon
2021-04-29 20:59:15 +02:00
parent 337864618c
commit 2be528a3fa
11 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ArduinoJson/Json/JsonSerializer.hpp
View File

@@ -14,6 +14,8 @@ namespace ARDUINOJSON_NAMESPACE {
template <typename TWriter>
class JsonSerializer : public Visitor<size_t> {
public:
static const bool producesText = true;
JsonSerializer(TWriter writer) : _formatter(writer) {}
FORCE_INLINE size_t visitArray(const CollectionData &array) {

2
src/ArduinoJson/Json/PrettyJsonSerializer.hpp
View File

@@ -16,7 +16,7 @@ class PrettyJsonSerializer : public JsonSerializer<TWriter> {
typedef JsonSerializer<TWriter> base;
public:
PrettyJsonSerializer(TWriter &writer) : base(writer), _nesting(0) {}
PrettyJsonSerializer(TWriter writer) : base(writer), _nesting(0) {}
size_t visitArray(const CollectionData &array) {
VariantSlot *slot = array.head();

2
src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
View File

@@ -17,6 +17,8 @@ namespace ARDUINOJSON_NAMESPACE {
template <typename TWriter>
class MsgPackSerializer : public Visitor<size_t> {
public:
static const bool producesText = false;
MsgPackSerializer(TWriter writer) : _writer(writer) {}
template <typename T>

7
src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
View File

@@ -8,18 +8,14 @@
namespace ARDUINOJSON_NAMESPACE {
// A Print implementation that allows to write in a char[]
class StaticStringWriter {
public:
StaticStringWriter(char *buf, size_t size) : end(buf + size - 1), p(buf) {
*p = '\0';
}
StaticStringWriter(char *buf, size_t size) : end(buf + size), p(buf) {}
size_t write(uint8_t c) {
if (p >= end)
return 0;
*p++ = static_cast<char>(c);
*p = '\0';
return 1;
}
@@ -29,7 +25,6 @@ class StaticStringWriter {
*p++ = static_cast<char>(*s++);
n--;
}
*p = '\0';
return size_t(p - begin);
}

17
src/ArduinoJson/Serialization/serialize.hpp
View File

@@ -23,11 +23,23 @@ size_t serialize(const TSource &source, TDestination &destination) {
}
template <template <typename> class TSerializer, typename TSource>
size_t serialize(const TSource &source, void *buffer, size_t bufferSize) {
typename enable_if<!TSerializer<StaticStringWriter>::producesText, size_t>::type
serialize(const TSource &source, void *buffer, size_t bufferSize) {
StaticStringWriter writer(reinterpret_cast<char *>(buffer), bufferSize);
return doSerialize<TSerializer>(source, writer);
}
template <template <typename> class TSerializer, typename TSource>
typename enable_if<TSerializer<StaticStringWriter>::producesText, size_t>::type
serialize(const TSource &source, void *buffer, size_t bufferSize) {
StaticStringWriter writer(reinterpret_cast<char *>(buffer), bufferSize);
size_t n = doSerialize<TSerializer>(source, writer);
// add null-terminator for text output (not counted in the size)
if (n < bufferSize)
reinterpret_cast<char *>(buffer)[n] = 0;
return n;
}
template <template <typename> class TSerializer, typename TSource,
typename TChar, size_t N>
#if defined _MSC_VER && _MSC_VER < 1900
@@ -36,8 +48,7 @@ typename enable_if<sizeof(remove_reference<TChar>::type) == 1, size_t>::type
typename enable_if<sizeof(TChar) == 1, size_t>::type
#endif
serialize(const TSource &source, TChar (&buffer)[N]) {
StaticStringWriter writer(reinterpret_cast<char *>(buffer), N);
return doSerialize<TSerializer>(source, writer);
return serialize<TSerializer>(source, buffer, N);
}
} // namespace ARDUINOJSON_NAMESPACE