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

Fixed exception when using Flash strings as object keys (fixes #784)

Browse Source
This commit is contained in:
Benoit Blanchon
2018-07-19 17:22:28 +02:00
parent d53a93e0ae
commit 3f666bd5f0
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -1,6 +1,11 @@
ArduinoJson: change log
=======================
HEAD
----
* Fixed exception when using Flash strings as object keys (issue #784)
v6.2.2-beta
-----------

2
src/ArduinoJson/Strings/FixedSizeFlashString.hpp
View File

@@ -15,7 +15,7 @@ class FixedSizeFlashString {
bool equals(const char* expected) const {
const char* actual = reinterpret_cast<const char*>(_str);
if (!actual || !expected) return actual == expected;
return strcmp_P(actual, expected) == 0;
return strncmp_P(expected, actual, _size) == 0;
}
bool is_null() const {

2
src/ArduinoJson/Strings/ZeroTerminatedFlashString.hpp
View File

@@ -14,7 +14,7 @@ class ZeroTerminatedFlashString {
bool equals(const char* expected) const {
const char* actual = reinterpret_cast<const char*>(_str);
if (!actual || !expected) return actual == expected;
return strcmp_P(actual, expected) == 0;
return strcmp_P(expected, actual) == 0;
}
bool is_null() const {