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

Support NUL inside string values (issue #1646)

Browse Source
This commit is contained in:
Benoit Blanchon
2021-11-21 15:07:56 +01:00
parent a27398e445
commit be70f6ddd7
22 changed files with 144 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ArduinoJson/Variant/ConverterImpl.hpp
View File

@@ -205,7 +205,7 @@ class MemoryPoolPrint : public Print {
CopiedString str() {
ARDUINOJSON_ASSERT(_size < _capacity);
return _pool->saveStringFromFreeZone(_size);
return CopiedString(_pool->saveStringFromFreeZone(_size), _size);
}
size_t write(uint8_t c) {
@@ -257,8 +257,7 @@ inline void convertToJson(const ::Printable& src, VariantRef dst) {
#if ARDUINOJSON_ENABLE_ARDUINO_STRING
inline void convertFromJson(VariantConstRef src, ::String& dst) {
const VariantData* data = getData(src);
String str = data != 0 ? data->asString() : String();
String str = src.as<String>();
if (str)
dst = str.c_str();
else
@@ -266,8 +265,7 @@ inline void convertFromJson(VariantConstRef src, ::String& dst) {
}
inline bool canConvertFromJson(VariantConstRef src, const ::String&) {
const VariantData* data = getData(src);
return data && data->isString();
return src.is<String>();
}
#endif
@@ -275,17 +273,15 @@ inline bool canConvertFromJson(VariantConstRef src, const ::String&) {
#if ARDUINOJSON_ENABLE_STD_STRING
inline void convertFromJson(VariantConstRef src, std::string& dst) {
const VariantData* data = getData(src);
String str = data != 0 ? data->asString() : String();
String str = src.as<String>();
if (str)
dst.assign(str.c_str());
dst.assign(str.c_str(), str.size());
else
serializeJson(src, dst);
}
inline bool canConvertFromJson(VariantConstRef src, const std::string&) {
const VariantData* data = getData(src);
return data && data->isString();
return src.is<String>();
}
#endif
@@ -293,13 +289,13 @@ inline bool canConvertFromJson(VariantConstRef src, const std::string&) {
#if ARDUINOJSON_ENABLE_STRING_VIEW
inline void convertFromJson(VariantConstRef src, std::string_view& dst) {
const char* str = src.as<const char*>();
String str = src.as<String>();
if (str) // the standard doesn't allow passing null to the constructor
dst = std::string_view(str);
dst = std::string_view(str.c_str(), str.size());
}
inline bool canConvertFromJson(VariantConstRef src, const std::string_view&) {
return src.is<const char*>();
return src.is<String>();
}
#endif

4
src/ArduinoJson/Variant/SlotFunctions.hpp
View File

@@ -30,14 +30,14 @@ template <typename TAdaptedString>
inline bool slotSetKey(VariantSlot* var, TAdaptedString key, MemoryPool*,
storage_policies::store_by_address) {
ARDUINOJSON_ASSERT(var);
var->setKey(LinkedString(key.data()));
var->setKey(LinkedString(key.data(), key.size()));
return true;
}
template <typename TAdaptedString>
inline bool slotSetKey(VariantSlot* var, TAdaptedString key, MemoryPool* pool,
storage_policies::store_by_copy) {
CopiedString dup = pool->saveString(key);
CopiedString dup(pool->saveString(key), key.size());
if (!dup)
return false;
ARDUINOJSON_ASSERT(var);

4
src/ArduinoJson/Variant/VariantCompare.hpp
View File

@@ -27,7 +27,7 @@ struct Comparer<T, typename enable_if<IsString<T>::value>::type>
explicit Comparer(T value) : rhs(value) {}
CompareResult visitString(const char *lhs) {
CompareResult visitString(const char *lhs, size_t) {
int i = adaptString(rhs).compare(lhs);
if (i < 0)
return COMPARE_RESULT_GREATER;
@@ -150,7 +150,7 @@ struct Comparer<T, typename enable_if<IsVisitable<T>::value>::type>
return accept(comparer);
}
CompareResult visitString(const char *lhs) {
CompareResult visitString(const char *lhs, size_t) {
Comparer<const char *> comparer(lhs);
return accept(comparer);
}

3
src/ArduinoJson/Variant/VariantContent.hpp
View File

@@ -49,10 +49,9 @@ union VariantContent {
UInt asUnsignedInteger;
Integer asSignedInteger;
CollectionData asCollection;
const char *asString;
struct {
const char *data;
size_t size;
} asRaw;
} asString;
};
} // namespace ARDUINOJSON_NAMESPACE

36
src/ArduinoJson/Variant/VariantData.hpp
View File

@@ -51,11 +51,13 @@ class VariantData {
case VALUE_IS_LINKED_STRING:
case VALUE_IS_OWNED_STRING:
return visitor.visitString(_content.asString);
return visitor.visitString(_content.asString.data,
_content.asString.size);
case VALUE_IS_OWNED_RAW:
case VALUE_IS_LINKED_RAW:
return visitor.visitRawJson(_content.asRaw.data, _content.asRaw.size);
return visitor.visitRawJson(_content.asString.data,
_content.asString.size);
case VALUE_IS_SIGNED_INTEGER:
return visitor.visitSignedInteger(_content.asSignedInteger);
@@ -105,10 +107,13 @@ class VariantData {
return toObject().copyFrom(src._content.asCollection, pool);
case VALUE_IS_OWNED_STRING:
return storeString(
adaptString(const_cast<char *>(src._content.asString)), pool);
adaptString(const_cast<char *>(src._content.asString.data),
src._content.asString.size),
pool);
case VALUE_IS_OWNED_RAW:
return storeOwnedRaw(
serialized(src._content.asRaw.data, src._content.asRaw.size), pool);
serialized(src._content.asString.data, src._content.asString.size),
pool);
default:
setType(src.type());
_content = src._content;
@@ -186,8 +191,8 @@ class VariantData {
void setLinkedRaw(SerializedValue<const char *> value) {
if (value.data()) {
setType(VALUE_IS_LINKED_RAW);
_content.asRaw.data = value.data();
_content.asRaw.size = value.size();
_content.asString.data = value.data();
_content.asString.size = value.size();
} else {
setType(VALUE_IS_NULL);
}
@@ -198,8 +203,8 @@ class VariantData {
const char *dup = pool->saveString(adaptString(value.data(), value.size()));
if (dup) {
setType(VALUE_IS_OWNED_RAW);
_content.asRaw.data = dup;
_content.asRaw.size = value.size();
_content.asString.data = dup;
_content.asString.size = value.size();
return true;
} else {
setType(VALUE_IS_NULL);
@@ -226,13 +231,15 @@ class VariantData {
void setString(CopiedString s) {
ARDUINOJSON_ASSERT(s);
setType(VALUE_IS_OWNED_STRING);
_content.asString = s.c_str();
_content.asString.data = s.c_str();
_content.asString.size = s.size();
}
void setString(LinkedString s) {
ARDUINOJSON_ASSERT(s);
setType(VALUE_IS_LINKED_STRING);
_content.asString = s.c_str();
_content.asString.data = s.c_str();
_content.asString.size = s.size();
}
template <typename TAdaptedString>
@@ -255,11 +262,10 @@ class VariantData {
size_t memoryUsage() const {
switch (type()) {
case VALUE_IS_OWNED_STRING:
return strlen(_content.asString) + 1;
case VALUE_IS_OWNED_RAW:
// We always add a zero at the end: the deduplication function uses it
// to detect the beginning of the next string.
return _content.asRaw.size + 1;
return _content.asString.size + 1;
case VALUE_IS_OBJECT:
case VALUE_IS_ARRAY:
return _content.asCollection.memoryUsage();
@@ -312,7 +318,7 @@ class VariantData {
void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
if (_flags & OWNED_VALUE_BIT)
_content.asString += stringDistance;
_content.asString.data += stringDistance;
if (_flags & COLLECTION_MASK)
_content.asCollection.movePointers(stringDistance, variantDistance);
}
@@ -342,7 +348,7 @@ class VariantData {
if (value.isNull())
setNull();
else
setString(LinkedString(value.data()));
setString(LinkedString(value.data(), value.size()));
return true;
}
@@ -358,7 +364,7 @@ class VariantData {
setNull();
return false;
}
setString(CopiedString(copy));
setString(CopiedString(copy, value.size()));
return true;
}
};

10
src/ArduinoJson/Variant/VariantImpl.hpp
View File

@@ -26,7 +26,7 @@ inline T VariantData::asIntegral() const {
return convertNumber<T>(_content.asSignedInteger);
case VALUE_IS_LINKED_STRING:
case VALUE_IS_OWNED_STRING:
return parseNumber<T>(_content.asString);
return parseNumber<T>(_content.asString.data);
case VALUE_IS_FLOAT:
return convertNumber<T>(_content.asFloat);
default:
@@ -62,7 +62,7 @@ inline T VariantData::asFloat() const {
return static_cast<T>(_content.asSignedInteger);
case VALUE_IS_LINKED_STRING:
case VALUE_IS_OWNED_STRING:
return parseNumber<T>(_content.asString);
return parseNumber<T>(_content.asString.data);
case VALUE_IS_FLOAT:
return static_cast<T>(_content.asFloat);
default:
@@ -73,11 +73,11 @@ inline T VariantData::asFloat() const {
inline String VariantData::asString() const {
switch (type()) {
case VALUE_IS_LINKED_STRING:
return String(_content.asString, true);
return String(_content.asString.data, _content.asString.size, true);
case VALUE_IS_OWNED_STRING:
return String(_content.asString, false);
return String(_content.asString.data, _content.asString.size, false);
default:
return 0;
return String();
}
}

2
src/ArduinoJson/Variant/VariantSlot.hpp
View File

@@ -108,7 +108,7 @@ class VariantSlot {
if (_flags & OWNED_KEY_BIT)
_key += stringDistance;
if (_flags & OWNED_VALUE_BIT)
_content.asString += stringDistance;
_content.asString.data += stringDistance;
if (_flags & COLLECTION_MASK)
_content.asCollection.movePointers(stringDistance, variantDistance);
}

2
src/ArduinoJson/Variant/Visitor.hpp
View File

@@ -46,7 +46,7 @@ struct Visitor {
return TResult();
}
TResult visitString(const char *) {
TResult visitString(const char *, size_t) {
return TResult();
}
};