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

bblanchon · bblanchon · commit 3f666bd5f08f · 2018-07-19T17:22:28.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ArduinoJson: change log
 =======================
 
+HEAD
+----
+
+* Fixed exception when using Flash strings as object keys (issue #784)
+
 v6.2.2-beta
 -----------
 
diff --git a/src/ArduinoJson/Strings/FixedSizeFlashString.hpp b/src/ArduinoJson/Strings/FixedSizeFlashString.hpp
@@ -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 {
diff --git a/src/ArduinoJson/Strings/ZeroTerminatedFlashString.hpp b/src/ArduinoJson/Strings/ZeroTerminatedFlashString.hpp
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class FixedSizeFlashString {`
`15`	`15`	`bool equals(const char* expected) const {`
`16`	`16`	`const char* actual = reinterpret_cast<const char*>(_str);`
`17`	`17`	`if (!actual \|\| !expected) return actual == expected;`
`18`		`- return strcmp_P(actual, expected) == 0;`
	`18`	`+ return strncmp_P(expected, actual, _size) == 0;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`bool is_null() const {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ZeroTerminatedFlashString {`
`14`	`14`	`bool equals(const char* expected) const {`
`15`	`15`	`const char* actual = reinterpret_cast<const char*>(_str);`
`16`	`16`	`if (!actual \|\| !expected) return actual == expected;`
`17`		`- return strcmp_P(actual, expected) == 0;`
	`17`	`+ return strcmp_P(expected, actual) == 0;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`bool is_null() const {`