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

Fixed static JsonString not being saved by reference

Browse Source
This commit is contained in:
Benoit Blanchon
2020-02-16 16:20:24 +01:00
parent 58298ec5ba
commit e6ddfc7afb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/tests/JsonVariant/set.cpp
View File

@ -79,7 +79,7 @@ TEST_CASE("JsonVariant and strings") {
variant.set(JsonString(str, true)); variant.set(JsonString(str, true));
strcpy(str, "world"); strcpy(str, "world");
REQUIRE(variant == "hello"); REQUIRE(variant == "world");
} }
SECTION("stores non-static JsonString by copy") { SECTION("stores non-static JsonString by copy") {

9
src/ArduinoJson/Strings/String.hpp
View File

@ -53,10 +53,11 @@ class StringAdapter : public RamStringAdapter {
return _isStatic; return _isStatic;
} }
/* const char* save(MemoryPool* pool) const { const char* save(MemoryPool* pool) const {
if (_isStatic) return c_str(); if (_isStatic)
return RamStringAdapter::save(pool); return data();
}*/ return RamStringAdapter::save(pool);
}
private: private:
bool _isStatic; bool _isStatic;