Set version to 6.2.3-beta

CHANGELOG.md

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

library.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/bblanchon/ArduinoJson.git"
   },
-  "version": "6.2.2-beta",
+  "version": "6.2.3-beta",
   "authors": {
     "name": "Benoit Blanchon",
     "url": "https://blog.benoitblanchon.fr"

library.properties

@@ -1,5 +1,5 @@
 name=ArduinoJson
-version=6.2.2-beta
+version=6.2.3-beta
 author=Benoit Blanchon <blog.benoitblanchon.fr>
 maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=An efficient and elegant JSON library for Arduino.

scripts/set-version.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -eux
+
+cd "$(dirname $0)/.."
+
+VERSION="$1"
+IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION")
+TAG="v$VERSION"
+UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG}))
+
+sed -i~ -bE "4s/HEAD/$TAG/; 5s/-+/$UNDERLINE/" CHANGELOG.md
+rm CHANGELOG.md*~
+sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json
+rm library.json*~
+
+sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties
+rm library.properties*~
+
+sed -i~ -bE \
+	-e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \
+	-e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \
+	-e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \
+	-e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \
+	src/ArduinoJson/version.hpp
+rm src/ArduinoJson/version.hpp*~

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 {

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 {

src/ArduinoJson/version.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#define ARDUINOJSON_VERSION "6.2.2-beta"
+#define ARDUINOJSON_VERSION "6.2.3-beta"
 #define ARDUINOJSON_VERSION_MAJOR 6
 #define ARDUINOJSON_VERSION_MINOR 2
-#define ARDUINOJSON_VERSION_REVISION 2
+#define ARDUINOJSON_VERSION_REVISION 3