Fix overflowed()

.github/workflows/ci.yml

@@ -93,40 +93,44 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - clang: "3.9"
+            runner: ubuntu-20.04
+            archive: bionic
+          - clang: "4.0"
+            runner: ubuntu-20.04
+            archive: bionic
+          - clang: "5.0"
+            runner: ubuntu-20.04
+            archive: bionic
+          - clang: "6.0"
+            runner: ubuntu-20.04
+            archive: bionic
           - clang: "7"
-            runner: ubuntu-22.04
-            archive: focal
+            runner: ubuntu-20.04
           - clang: "8"
             cxxflags: -fsanitize=leak -fno-sanitize-recover=all
-            runner: ubuntu-22.04
-            archive: focal
+            runner: ubuntu-20.04
           - clang: "9"
             cxxflags: -fsanitize=undefined -fno-sanitize-recover=all
-            runner: ubuntu-22.04
-            archive: focal
+            runner: ubuntu-20.04
           - clang: "10"
             cxxflags: -fsanitize=address -fno-sanitize-recover=all
-            runner: ubuntu-22.04
-            archive: focal
+            runner: ubuntu-20.04
           - clang: "11"
             runner: ubuntu-22.04
           - clang: "12"
             runner: ubuntu-22.04
           - clang: "13"
             runner: ubuntu-22.04
-          - clang: 14
-          - clang: 15
-          - clang: 16
-          - clang: 17
-          - clang: 18
-          - clang: 19
-    runs-on: ${{ matrix.runner || 'ubuntu-latest' }}
+          - clang: "14"
+            runner: ubuntu-22.04
+          - clang: "15"
+            runner: ubuntu-22.04
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Add archive repositories
         if: matrix.archive
         run: |
-          sudo gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
-          sudo gpg --export 3B4FE6ACC0B21F32 | sudo tee /etc/apt/trusted.gpg.d/ubuntu-keyring.gpg > /dev/null
           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} main'
           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} universe'
       - name: Install Clang ${{ matrix.clang }}
@@ -134,9 +138,10 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y clang-${{ matrix.clang }}
       - name: Install libc++ ${{ matrix.clang }}
+        if: matrix.clang >= 11
         run: sudo apt-get install -y libc++-${{ matrix.clang }}-dev libc++abi-${{ matrix.clang }}-dev
       - name: Install libunwind ${{ matrix.clang }}
-        if: matrix.clang == 12 # dependency is missing in Ubuntu 22.04
+        if: matrix.clang == 12  # dependency is missing in Ubuntu 22.04
         run: sudo apt-get install -y libunwind-${{ matrix.clang }}-dev
       - name: Checkout
         uses: actions/checkout@v4
@@ -158,7 +163,7 @@ jobs:
   conf_test:
     name: Test configuration on Linux
     needs: [gcc, clang]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: |
@@ -252,7 +257,7 @@ jobs:
             board: arduino:avr:uno
           - core: arduino:samd
             board: arduino:samd:mkr1000
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -407,7 +412,7 @@ jobs:
   arm:
     name: GCC for ARM processor
     needs: gcc
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: |
@@ -426,7 +431,7 @@ jobs:
   coverage:
     needs: gcc
     name: Coverage
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: sudo apt-get install -y lcov ninja-build
@@ -458,7 +463,7 @@ jobs:
   valgrind:
     needs: gcc
     name: Valgrind
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: |
@@ -480,24 +485,24 @@ jobs:
   clang-tidy:
     needs: clang
     name: Clang-Tidy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
-        run: sudo apt-get install -y clang-tidy libc++-dev libc++abi-dev
+        run: sudo apt-get install -y clang-tidy cmake ninja-build
       - name: Checkout
         uses: actions/checkout@v4
       - name: Configure
-        run: cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug .
+        run: cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy-10;--warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug .
         env:
-          CC: clang
-          CXX: clang++
+          CC: clang-10
+          CXX: clang++-10
       - name: Check
         run: cmake --build . -- -k 0
 
   amalgamate:
     needs: gcc
     name: Amalgamate ArduinoJson.h
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -573,7 +578,7 @@ jobs:
 
   codeql:
     name: CodeQL
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: gcc
 
     permissions:
@@ -582,20 +587,20 @@ jobs:
       security-events: write
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+    - name: Checkout repository
+      uses: actions/checkout@v4
 
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: cpp
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: cpp
 
-      - name: Build
-        run: |
-          cmake -DCMAKE_BUILD_TYPE=Debug .
-          cmake --build .
+    - name: Build
+      run: |
+        cmake -DCMAKE_BUILD_TYPE=Debug .
+        cmake --build .
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
-        with:
-          category: "/language:cpp"
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:cpp"

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: Create release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Set variables
         id: init

CHANGELOG.md

@@ -4,6 +4,8 @@ ArduinoJson: change log
 HEAD
 ----
 
+* Fix conversion from static string to number
+* Slightly reduce code size
 * Optimize storage of static strings
 
 > ### BREAKING CHANGES
@@ -38,23 +40,6 @@ HEAD
 > doc["key"] = str; // same as previous line for supported string classes (`String`, `std::string`, etc.)
 > ```
 
-v7.4.1 (2025-04-11)
-------
-
-* Fix crash with tiny Flash strings (issue #2170)
-
-v7.4.0 (2025-04-09)
-------
-
-* Optimize storage of tiny strings (up to 3 characters)
-* Fix support for `const char[]` (issue #2166)
-
-v7.3.1 (2025-02-27)
-------
-
-* Fix conversion from static string to number
-* Slightly reduce code size
-
 v7.3.0 (2024-12-29)
 ------
 

CMakeLists.txt

@@ -10,7 +10,7 @@ if(ESP_PLATFORM)
 	return()
 endif()
 
-project(ArduinoJson VERSION 7.4.1)
+project(ArduinoJson VERSION 7.3.0)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 	include(CTest)

README.md

@@ -80,7 +80,7 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
     * Continuously tested on
         * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
         * [GCC 4.8, 5, 6, 7, 8, 9, 10, 11, 12](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
-        * [Clang 7 to 19](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
+        * [Clang 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10, 11, 12, 13, 14, 15](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
     * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
     * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/)
 * Well documented

appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.4.1.{build}
+version: 7.3.0.{build}
 environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022

extras/tests/Deprecated/BasicJsonDocument.cpp

@@ -46,7 +46,7 @@ TEST_CASE("BasicJsonDocument") {
     deserializeJson(doc, "{\"hello\":\"world\"}");
     REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
     doc.clear();
-    REQUIRE(allocatorLog == "AARARDDD");
+    REQUIRE(allocatorLog == "ARAARDDD");
   }
 
   SECTION("copy") {

extras/tests/JsonDeserializer/input_types.cpp

@@ -26,8 +26,8 @@ TEST_CASE("deserializeJson(char*)") {
   REQUIRE(spy.log() ==
           AllocatorLog{
               Allocate(sizeofStringBuffer()),
-              Allocate(sizeofPool()),
               Reallocate(sizeofStringBuffer(), sizeofString("hello")),
+              Allocate(sizeofPool()),
               Allocate(sizeofStringBuffer()),
               Reallocate(sizeofStringBuffer(), sizeofString("world")),
               Reallocate(sizeofPool(), sizeofObject(1)),

extras/tests/JsonDeserializer/object.cpp

@@ -292,23 +292,22 @@ TEST_CASE("deserialize JSON object") {
     }
 
     SECTION("Repeated key") {
-      DeserializationError err =
-          deserializeJson(doc, "{alfa:{bravo:{charlie:1}},alfa:2}");
+      DeserializationError err = deserializeJson(doc, "{a:{b:{c:1}},a:2}");
 
       REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(doc.as<std::string>() == "{\"alfa\":2}");
+      REQUIRE(doc.as<std::string>() == "{\"a\":2}");
       REQUIRE(spy.log() ==
               AllocatorLog{
                   Allocate(sizeofStringBuffer()),
+                  Reallocate(sizeofStringBuffer(), sizeofString("a")),
                   Allocate(sizeofPool()),
-                  Reallocate(sizeofStringBuffer(), sizeofString("alfa")),
                   Allocate(sizeofStringBuffer()),
-                  Reallocate(sizeofStringBuffer(), sizeofString("bravo")),
+                  Reallocate(sizeofStringBuffer(), sizeofString("b")),
                   Allocate(sizeofStringBuffer()),
-                  Reallocate(sizeofStringBuffer(), sizeofString("charlie")),
+                  Reallocate(sizeofStringBuffer(), sizeofString("c")),
                   Allocate(sizeofStringBuffer()),
-                  Deallocate(sizeofString("bravo")),
-                  Deallocate(sizeofString("charlie")),
+                  Deallocate(sizeofString("b")),
+                  Deallocate(sizeofString("c")),
                   Deallocate(sizeofStringBuffer()),
                   Reallocate(sizeofPool(), sizeofObject(2) + sizeofObject(1)),
               });
@@ -379,7 +378,7 @@ TEST_CASE("deserialize JSON object under memory constraints") {
   }
 
   SECTION("pool allocation fails") {
-    timebomb.setCountdown(1);
+    timebomb.setCountdown(2);
     char input[] = "{\"a\":1}";
 
     DeserializationError err = deserializeJson(doc, input);
@@ -390,11 +389,11 @@ TEST_CASE("deserialize JSON object under memory constraints") {
 
   SECTION("string allocation fails") {
     timebomb.setCountdown(3);
-    char input[] = "{\"alfa\":\"bravo\"}";
+    char input[] = "{\"a\":\"b\"}";
 
     DeserializationError err = deserializeJson(doc, input);
 
     REQUIRE(err == DeserializationError::NoMemory);
-    REQUIRE(doc.as<std::string>() == "{\"alfa\":null}");
+    REQUIRE(doc.as<std::string>() == "{\"a\":null}");
   }
 }

extras/tests/JsonDeserializer/string.cpp

@@ -133,8 +133,8 @@ TEST_CASE("Allocation of the key fails") {
     REQUIRE(spy.log() ==
             AllocatorLog{
                 Allocate(sizeofStringBuffer()),
-                Allocate(sizeofPool()),
                 Reallocate(sizeofStringBuffer(), sizeofString("hello")),
+                Allocate(sizeofPool()),
                 AllocateFail(sizeofStringBuffer()),
                 ReallocateFail(sizeofPool(), sizeofObject(1)),
             });
@@ -155,8 +155,8 @@ TEST_CASE("Allocation of the key fails") {
     REQUIRE(spy.log() ==
             AllocatorLog{
                 Allocate(sizeofStringBuffer()),
-                Allocate(sizeofPool()),
                 Reallocate(sizeofStringBuffer(), sizeofString("hello")),
+                Allocate(sizeofPool()),
                 AllocateFail(sizeofStringBuffer()),
                 ReallocateFail(sizeofPool(), sizeofObject(1)),
             });

extras/tests/JsonDocument/assignment.cpp

@@ -69,8 +69,6 @@ TEST_CASE("JsonDocument assignment") {
       doc2 = std::move(doc1);
 
       REQUIRE(doc2.as<std::string>() == "{\"hello\":\"world\"}");
-
-      // NOLINTNEXTLINE(clang-analyzer-cplusplus.Move)
       REQUIRE(doc1.as<std::string>() == "null");
     }
     REQUIRE(spyingAllocator.log() == AllocatorLog{

extras/tests/JsonDocument/constructor.cpp

@@ -44,8 +44,6 @@ TEST_CASE("JsonDocument constructor") {
       JsonDocument doc2(std::move(doc1));
 
       REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
-
-      // NOLINTNEXTLINE(clang-analyzer-cplusplus.Move)
       REQUIRE(doc1.as<std::string>() == "null");
     }
     REQUIRE(spyingAllocator.log() == AllocatorLog{

extras/tests/JsonDocument/set.cpp

@@ -89,13 +89,6 @@ TEST_CASE("JsonDocument::set()") {
                          });
   }
 
-  SECTION("Flash tiny string") {  // issue #2170
-    doc.set(F("abc"));
-
-    REQUIRE(doc.as<const char*>() == "abc"_s);
-    REQUIRE(spy.log() == AllocatorLog{});
-  }
-
 #ifdef HAS_VARIABLE_LENGTH_ARRAY
   SECTION("VLA") {
     size_t i = 16;

extras/tests/JsonDocument/shrinkToFit.cpp

@@ -179,15 +179,15 @@ TEST_CASE("JsonDocument::shrinkToFit()") {
   }
 
   SECTION("owned string in object") {
-    doc["key1"_s] = "value"_s;
+    doc["key"_s] = "value"_s;
 
     doc.shrinkToFit();
 
-    REQUIRE(doc.as<std::string>() == "{\"key1\":\"value\"}");
+    REQUIRE(doc.as<std::string>() == "{\"key\":\"value\"}");
     REQUIRE(spyingAllocator.log() ==
             AllocatorLog{
                 Allocate(sizeofPool()),
-                Allocate(sizeofString("key1")),
+                Allocate(sizeofString("key")),
                 Allocate(sizeofString("value")),
                 Reallocate(sizeofPool(), sizeofPool(2)),
             });

extras/tests/JsonObject/set.cpp

@@ -88,13 +88,13 @@ TEST_CASE("JsonObject::set()") {
     JsonDocument doc3(&timebomb);
     JsonObject obj3 = doc3.to<JsonObject>();
 
-    obj1["alpha"_s] = 1;
-    obj1["beta"_s] = 2;
+    obj1["a"_s] = 1;
+    obj1["b"_s] = 2;
 
     bool success = obj3.set(obj1);
 
     REQUIRE(success == false);
-    REQUIRE(doc3.as<std::string>() == "{\"alpha\":1}");
+    REQUIRE(doc3.as<std::string>() == "{\"a\":1}");
   }
 
   SECTION("copy fails in the middle of an array") {

extras/tests/JsonVariant/as.cpp

@@ -199,7 +199,7 @@ TEST_CASE("JsonVariant::as()") {
     REQUIRE(variant.as<JsonString>() == "hello");
   }
 
-  SECTION("set(std::string(\"4.2\")) (tiny string optimization)") {
+  SECTION("set(std::string(\"4.2\"))") {
     variant.set("4.2"_s);
 
     REQUIRE(variant.as<bool>() == true);
@@ -211,18 +211,6 @@ TEST_CASE("JsonVariant::as()") {
     REQUIRE(variant.as<JsonString>().isStatic() == false);
   }
 
-  SECTION("set(std::string(\"123.45\"))") {
-    variant.set("123.45"_s);
-
-    REQUIRE(variant.as<bool>() == true);
-    REQUIRE(variant.as<long>() == 123L);
-    REQUIRE(variant.as<double>() == Approx(123.45));
-    REQUIRE(variant.as<const char*>() == "123.45"_s);
-    REQUIRE(variant.as<std::string>() == "123.45"_s);
-    REQUIRE(variant.as<JsonString>() == "123.45");
-    REQUIRE(variant.as<JsonString>().isStatic() == false);
-  }
-
   SECTION("set(\"true\")") {
     variant.set("true");
 

extras/tests/JsonVariant/set.cpp

@@ -65,18 +65,6 @@ TEST_CASE("JsonVariant::set() when there is enough memory") {
                          });
   }
 
-  SECTION("char* (tiny string optimization)") {
-    char str[16];
-
-    strcpy(str, "abc");
-    bool result = variant.set(str);
-    strcpy(str, "def");
-
-    REQUIRE(result == true);
-    REQUIRE(variant == "abc");  // stores by copy
-    REQUIRE(spy.log() == AllocatorLog{});
-  }
-
   SECTION("(char*)0") {
     bool result = variant.set(static_cast<char*>(0));
 

extras/tests/Misc/CMakeLists.txt

@@ -7,7 +7,6 @@ add_executable(MiscTests
 	conflicts.cpp
 	issue1967.cpp
 	issue2129.cpp
-	issue2166.cpp
 	JsonString.cpp
 	NoArduinoHeader.cpp
 	printable.cpp

extras/tests/Misc/StringAdapters.cpp

@@ -128,7 +128,6 @@ TEST_CASE("IsString<T>") {
   CHECK(IsString<const __FlashStringHelper*>::value == true);
   CHECK(IsString<const char*>::value == true);
   CHECK(IsString<const char[8]>::value == true);
-  CHECK(IsString<const char[]>::value == true);
   CHECK(IsString<::String>::value == true);
   CHECK(IsString<::StringSumHelper>::value == true);
   CHECK(IsString<const EmptyStruct*>::value == false);

extras/tests/Misc/issue2166.cpp

@@ -1,22 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-struct CCLASS {
-  static const char mszKey[];
-};
-
-TEST_CASE("Issue #2166") {
-  JsonDocument doc;
-  doc[CCLASS::mszKey] = 12;
-  REQUIRE(doc.as<std::string>() == "{\"test3\":12}");
-
-  JsonObject obj = doc.to<JsonObject>();
-  obj[CCLASS::mszKey] = 12;
-  REQUIRE(doc.as<std::string>() == "{\"test3\":12}");
-}
-
-const char CCLASS::mszKey[] = "test3";

extras/tests/MsgPackDeserializer/deserializeArray.cpp

@@ -5,11 +5,8 @@
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-#include "Allocators.hpp"
-
 TEST_CASE("deserialize MsgPack array") {
-  SpyingAllocator spy;
-  JsonDocument doc(&spy);
+  JsonDocument doc;
 
   SECTION("fixarray") {
     SECTION("empty") {
@@ -33,24 +30,6 @@ TEST_CASE("deserialize MsgPack array") {
       REQUIRE(array[0] == 1);
       REQUIRE(array[1] == 2);
     }
-
-    SECTION("tiny strings") {
-      DeserializationError error =
-          deserializeMsgPack(doc, "\x92\xA3xxx\xA3yyy");
-
-      REQUIRE(error == DeserializationError::Ok);
-      REQUIRE(doc.is<JsonArray>());
-      REQUIRE(doc.size() == 2);
-      REQUIRE(doc[0] == "xxx");
-      REQUIRE(doc[1] == "yyy");
-      REQUIRE(spy.log() == AllocatorLog{
-                               Allocate(sizeofPool()),
-                               Allocate(sizeofString("xxx")),
-                               // Buffer is reused for the next string
-                               Deallocate(sizeofString("xxx")),
-                               Reallocate(sizeofPool(), sizeofPool(2)),
-                           });
-    }
   }
 
   SECTION("array 16") {

extras/tests/MsgPackDeserializer/deserializeVariant.cpp

@@ -348,14 +348,13 @@ TEST_CASE("deserializeMsgPack() under memory constaints") {
     SECTION("{}") {
       checkError(0, "\x80", DeserializationError::Ok);
     }
-    SECTION("{Hello:1}") {
-      checkError(1, "\x81\xA5Hello\x01", DeserializationError::NoMemory);
-      checkError(2, "\x81\xA5Hello\x01", DeserializationError::Ok);
+    SECTION("{H:1}") {
+      checkError(1, "\x81\xA1H\x01", DeserializationError::NoMemory);
+      checkError(2, "\x81\xA1H\x01", DeserializationError::Ok);
     }
-    SECTION("{Hello:1,World:2}") {
-      checkError(2, "\x82\xA5Hello\x01\xA5World\x02",
-                 DeserializationError::NoMemory);
-      checkError(3, "\x82\xA5Hello\x01\xA5World\x02", DeserializationError::Ok);
+    SECTION("{H:1,W:2}") {
+      checkError(2, "\x82\xA1H\x01\xA1W\x02", DeserializationError::NoMemory);
+      checkError(3, "\x82\xA1H\x01\xA1W\x02", DeserializationError::Ok);
     }
   }
 
@@ -363,16 +362,14 @@ TEST_CASE("deserializeMsgPack() under memory constaints") {
     SECTION("{}") {
       checkError(0, "\xDE\x00\x00", DeserializationError::Ok);
     }
-    SECTION("{Hello:1}") {
-      checkError(1, "\xDE\x00\x01\xA5Hello\x01",
-                 DeserializationError::NoMemory);
-      checkError(2, "\xDE\x00\x01\xA5Hello\x01", DeserializationError::Ok);
+    SECTION("{H:1}") {
+      checkError(1, "\xDE\x00\x01\xA1H\x01", DeserializationError::NoMemory);
+      checkError(2, "\xDE\x00\x01\xA1H\x01", DeserializationError::Ok);
     }
-    SECTION("{Hello:1,World:2}") {
-      checkError(2, "\xDE\x00\x02\xA5Hello\x01\xA5World\x02",
+    SECTION("{H:1,W:2}") {
+      checkError(2, "\xDE\x00\x02\xA1H\x01\xA1W\x02",
                  DeserializationError::NoMemory);
-      checkError(3, "\xDE\x00\x02\xA5Hello\x01\xA5World\x02",
-                 DeserializationError::Ok);
+      checkError(3, "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok);
     }
   }
 
@@ -385,8 +382,8 @@ TEST_CASE("deserializeMsgPack() under memory constaints") {
                  DeserializationError::NoMemory);
       checkError(2, "\xDF\x00\x00\x00\x01\xA1H\x01", DeserializationError::Ok);
     }
-    SECTION("{Hello:1,World:2}") {
-      checkError(2, "\xDF\x00\x00\x00\x02\xA5Hello\x01\xA5World\x02",
+    SECTION("{H:1,W:2}") {
+      checkError(2, "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02",
                  DeserializationError::NoMemory);
       checkError(3, "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02",
                  DeserializationError::Ok);

extras/tests/ResourceManager/CMakeLists.txt

@@ -9,7 +9,6 @@ add_executable(ResourceManagerTests
 	saveString.cpp
 	shrinkToFit.cpp
 	size.cpp
-	StringBuffer.cpp
 	StringBuilder.cpp
 	swap.cpp
 )

extras/tests/ResourceManager/StringBuffer.cpp

@@ -1,50 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.hpp>
-#include <catch.hpp>
-
-#include "Allocators.hpp"
-#include "Literals.hpp"
-
-using namespace ArduinoJson::detail;
-
-TEST_CASE("StringBuffer") {
-  SpyingAllocator spy;
-  ResourceManager resources(&spy);
-  StringBuffer sb(&resources);
-  VariantData variant;
-
-  SECTION("Tiny string") {
-    auto ptr = sb.reserve(3);
-    strcpy(ptr, "hi!");
-    sb.save(&variant);
-
-    REQUIRE(variant.type() == VariantType::TinyString);
-    REQUIRE(variant.asString(&resources) == "hi!");
-  }
-
-  SECTION("Tiny string can't contain NUL") {
-    auto ptr = sb.reserve(3);
-    memcpy(ptr, "a\0b", 3);
-    sb.save(&variant);
-
-    REQUIRE(variant.type() == VariantType::OwnedString);
-
-    auto str = variant.asString(&resources);
-    REQUIRE(str.size() == 3);
-    REQUIRE(str.c_str()[0] == 'a');
-    REQUIRE(str.c_str()[1] == 0);
-    REQUIRE(str.c_str()[2] == 'b');
-  }
-
-  SECTION("Tiny string can't have 4 characters") {
-    auto ptr = sb.reserve(4);
-    strcpy(ptr, "alfa");
-    sb.save(&variant);
-
-    REQUIRE(variant.type() == VariantType::OwnedString);
-    REQUIRE(variant.asString(&resources) == "alfa");
-  }
-}

extras/tests/ResourceManager/StringBuilder.cpp

@@ -2,12 +2,11 @@
 // Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 
-#include <ArduinoJson.hpp>
+#include <ArduinoJson/Memory/StringBuilder.hpp>
 #include <catch.hpp>
 
 #include "Allocators.hpp"
 
-using namespace ArduinoJson;
 using namespace ArduinoJson::detail;
 
 TEST_CASE("StringBuilder") {
@@ -17,36 +16,17 @@ TEST_CASE("StringBuilder") {
 
   SECTION("Empty string") {
     StringBuilder str(&resources);
-    VariantData data;
 
     str.startString();
-    str.save(&data);
+    str.save();
 
+    REQUIRE(resources.size() == sizeofString(""));
     REQUIRE(resources.overflowed() == false);
-    REQUIRE(spyingAllocator.log() == AllocatorLog{
-                                         Allocate(sizeofStringBuffer()),
-                                     });
-    REQUIRE(data.type() == VariantType::TinyString);
-  }
-
-  SECTION("Tiny string") {
-    StringBuilder str(&resources);
-
-    str.startString();
-    str.append("url");
-
-    REQUIRE(str.isValid() == true);
-    REQUIRE(str.str() == "url");
-    REQUIRE(spyingAllocator.log() == AllocatorLog{
-                                         Allocate(sizeofStringBuffer()),
-                                     });
-
-    VariantData data;
-    str.save(&data);
-
-    REQUIRE(resources.overflowed() == false);
-    REQUIRE(data.type() == VariantType::TinyString);
-    REQUIRE(data.asString(&resources) == "url");
+    REQUIRE(spyingAllocator.log() ==
+            AllocatorLog{
+                Allocate(sizeofStringBuffer()),
+                Reallocate(sizeofStringBuffer(), sizeofString("")),
+            });
   }
 
   SECTION("Short string fits in first allocation") {
@@ -116,72 +96,48 @@ TEST_CASE("StringBuilder") {
   }
 }
 
-static VariantData saveString(StringBuilder& builder, const char* s) {
-  VariantData data;
-  builder.startString();
-  builder.append(s);
-  builder.save(&data);
-  return data;
+static StringNode* addStringToPool(ResourceManager& resources, const char* s) {
+  StringBuilder str(&resources);
+  str.startString();
+  str.append(s);
+  return str.save();
 }
 
 TEST_CASE("StringBuilder::save() deduplicates strings") {
-  SpyingAllocator spy;
-  ResourceManager resources(&spy);
-  StringBuilder builder(&resources);
+  ResourceManager resources;
 
   SECTION("Basic") {
-    auto s1 = saveString(builder, "hello");
-    auto s2 = saveString(builder, "world");
-    auto s3 = saveString(builder, "hello");
+    auto s1 = addStringToPool(resources, "hello");
+    auto s2 = addStringToPool(resources, "world");
+    auto s3 = addStringToPool(resources, "hello");
 
-    REQUIRE(s1.asString(&resources) == "hello");
-    REQUIRE(s2.asString(&resources) == "world");
-    REQUIRE(+s1.asString(&resources).c_str() ==
-            +s3.asString(&resources).c_str());  // same address
-
-    REQUIRE(spy.log() ==
-            AllocatorLog{
-                Allocate(sizeofStringBuffer()),
-                Reallocate(sizeofStringBuffer(), sizeofString("hello")),
-                Allocate(sizeofStringBuffer()),
-                Reallocate(sizeofStringBuffer(), sizeofString("world")),
-                Allocate(sizeofStringBuffer()),
-            });
+    REQUIRE(s1 == s3);
+    REQUIRE(s2 != s3);
+    REQUIRE(s1->references == 2);
+    REQUIRE(s2->references == 1);
+    REQUIRE(s3->references == 2);
+    REQUIRE(resources.size() == sizeofString("hello") + sizeofString("world"));
   }
 
   SECTION("Requires terminator") {
-    auto s1 = saveString(builder, "hello world");
-    auto s2 = saveString(builder, "hello");
+    auto s1 = addStringToPool(resources, "hello world");
+    auto s2 = addStringToPool(resources, "hello");
 
-    REQUIRE(s1.asString(&resources) == "hello world");
-    REQUIRE(s2.asString(&resources) == "hello");
-    REQUIRE(+s2.asString(&resources).c_str() !=
-            +s1.asString(&resources).c_str());  // different address
-
-    REQUIRE(spy.log() ==
-            AllocatorLog{
-                Allocate(sizeofStringBuffer()),
-                Reallocate(sizeofStringBuffer(), sizeofString("hello world")),
-                Allocate(sizeofStringBuffer()),
-                Reallocate(sizeofStringBuffer(), sizeofString("hello")),
-            });
+    REQUIRE(s2 != s1);
+    REQUIRE(s1->references == 1);
+    REQUIRE(s2->references == 1);
+    REQUIRE(resources.size() ==
+            sizeofString("hello world") + sizeofString("hello"));
   }
 
   SECTION("Don't overrun") {
-    auto s1 = saveString(builder, "hello world");
-    auto s2 = saveString(builder, "worl");
+    auto s1 = addStringToPool(resources, "hello world");
+    auto s2 = addStringToPool(resources, "wor");
 
-    REQUIRE(s1.asString(&resources) == "hello world");
-    REQUIRE(s2.asString(&resources) == "worl");
-    REQUIRE(s2.asString(&resources).c_str() !=
-            s1.asString(&resources).c_str());  // different address
-
-    REQUIRE(spy.log() ==
-            AllocatorLog{
-                Allocate(sizeofStringBuffer()),
-                Reallocate(sizeofStringBuffer(), sizeofString("hello world")),
-                Allocate(sizeofStringBuffer()),
-                Reallocate(sizeofStringBuffer(), sizeofString("worl")),
-            });
+    REQUIRE(s2 != s1);
+    REQUIRE(s1->references == 1);
+    REQUIRE(s2->references == 1);
+    REQUIRE(resources.size() ==
+            sizeofString("hello world") + sizeofString("wor"));
   }
 }

idf_component.yml

@@ -1,7 +1,7 @@
-version: "7.4.1"
+version: "7.3.0"
 description: >-
   A simple and efficient JSON library for embedded C++.
-  ★ 6898 stars on GitHub!
+  ★ 6785 stars on GitHub!
   Supports serialization, deserialization, MessagePack, streams, filtering, and more.
   Fully tested and documented.
 url: https://arduinojson.org/

library.json

@@ -1,13 +1,13 @@
 {
   "name": "ArduinoJson",
   "keywords": "json, rest, http, web",
-  "description": "A simple and efficient JSON library for embedded C++. ⭐ 6898 stars on GitHub! Supports serialization, deserialization, MessagePack, streams, filtering, and more. Fully tested and documented.",
+  "description": "A simple and efficient JSON library for embedded C++. ⭐ 6785 stars on GitHub! Supports serialization, deserialization, MessagePack, streams, filtering, and more. Fully tested and documented.",
   "homepage": "https://arduinojson.org/?utm_source=meta&utm_medium=library.json",
   "repository": {
     "type": "git",
     "url": "https://github.com/bblanchon/ArduinoJson.git"
   },
-  "version": "7.4.1",
+  "version": "7.3.0",
   "authors": {
     "name": "Benoit Blanchon",
     "url": "https://blog.benoitblanchon.fr"

library.properties

@@ -1,9 +1,9 @@
 name=ArduinoJson
-version=7.4.1
+version=7.3.0
 author=Benoit Blanchon <blog.benoitblanchon.fr>
 maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=A simple and efficient JSON library for embedded C++.
-paragraph=⭐ 6898 stars on GitHub! Supports serialization, deserialization, MessagePack, streams, filtering, and more. Fully tested and documented.
+paragraph=⭐ 6785 stars on GitHub! Supports serialization, deserialization, MessagePack, streams, filtering, and more. Fully tested and documented.
 category=Data Processing
 url=https://arduinojson.org/?utm_source=meta&utm_medium=library.properties
 architectures=*

src/ArduinoJson/Json/JsonDeserializer.hpp

@@ -275,11 +275,13 @@ class JsonDeserializer {
       if (memberFilter.allow()) {
         auto member = object.getMember(adaptString(key), resources_);
         if (!member) {
-          auto keyVariant = object.addPair(&member, resources_);
-          if (!keyVariant)
-            return DeserializationError::NoMemory;
+          // Save key in memory pool.
+          auto savedKey = stringBuilder_.save();
 
-          stringBuilder_.save(keyVariant);
+          // Allocate slot in object
+          member = object.addMember(savedKey, resources_);
+          if (!member)
+            return DeserializationError::NoMemory;
         } else {
           member->clear(resources_);
         }
@@ -388,7 +390,7 @@ class JsonDeserializer {
     if (err)
       return err;
 
-    stringBuilder_.save(&variant);
+    variant.setOwnedString(stringBuilder_.save());
 
     return DeserializationError::Ok;
   }

src/ArduinoJson/Memory/StringBuffer.hpp

@@ -32,26 +32,7 @@ class StringBuffer {
     return node_->data;
   }
 
-  JsonString str() const {
-    ARDUINOJSON_ASSERT(node_ != nullptr);
-    return JsonString(node_->data, node_->length);
-  }
-
-  void save(VariantData* data) {
-    ARDUINOJSON_ASSERT(node_ != nullptr);
-    const char* s = node_->data;
-    if (isTinyString(s, size_))
-      data->setTinyString(adaptString(s, size_));
-    else
-      data->setOwnedString(commitStringNode());
-  }
-
-  void saveRaw(VariantData* data) {
-    data->setRawString(commitStringNode());
-  }
-
- private:
-  StringNode* commitStringNode() {
+  StringNode* save() {
     ARDUINOJSON_ASSERT(node_ != nullptr);
     node_->data[size_] = 0;
     auto node = resources_->getString(adaptString(node_->data, size_));
@@ -71,6 +52,13 @@ class StringBuffer {
     return node;
   }
 
+  JsonString str() const {
+    ARDUINOJSON_ASSERT(node_ != nullptr);
+
+    return JsonString(node_->data, node_->length);
+  }
+
+ private:
   ResourceManager* resources_;
   StringNode* node_ = nullptr;
   size_t size_ = 0;

src/ArduinoJson/Memory/StringBuilder.hpp

@@ -25,18 +25,10 @@ class StringBuilder {
       node_ = resources_->createString(initialCapacity);
   }
 
-  void save(VariantData* variant) {
-    ARDUINOJSON_ASSERT(variant != nullptr);
+  StringNode* save() {
     ARDUINOJSON_ASSERT(node_ != nullptr);
-
-    char* p = node_->data;
-    if (isTinyString(p, size_)) {
-      variant->setTinyString(adaptString(p, size_));
-      return;
-    }
-
-    p[size_] = 0;
-    StringNode* node = resources_->getString(adaptString(p, size_));
+    node_->data[size_] = 0;
+    StringNode* node = resources_->getString(adaptString(node_->data, size_));
     if (!node) {
       node = resources_->resizeString(node_, size_);
       ARDUINOJSON_ASSERT(node != nullptr);  // realloc to smaller can't fail
@@ -45,7 +37,7 @@ class StringBuilder {
     } else {
       node->references++;
     }
-    variant->setOwnedString(node);
+    return node;
   }
 
   void append(const char* s) {

src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp

@@ -305,7 +305,7 @@ class MsgPackDeserializer {
     if (err)
       return err;
 
-    stringBuffer_.save(variant);
+    variant->setOwnedString(stringBuffer_.save());
     return DeserializationError::Ok;
   }
 
@@ -334,7 +334,7 @@ class MsgPackDeserializer {
     if (err)
       return err;
 
-    stringBuffer_.saveRaw(variant);
+    variant->setRawString(stringBuffer_.save());
     return DeserializationError::Ok;
   }
 
@@ -403,16 +403,19 @@ class MsgPackDeserializer {
 
       JsonString key = stringBuffer_.str();
       TFilter memberFilter = filter[key.c_str()];
-      VariantData* member = 0;
+      VariantData* member;
 
       if (memberFilter.allow()) {
         ARDUINOJSON_ASSERT(object != 0);
 
-        auto keyVariant = object->addPair(&member, resources_);
-        if (!keyVariant)
-          return DeserializationError::NoMemory;
+        // Save key in memory pool.
+        auto savedKey = stringBuffer_.save();
 
-        stringBuffer_.save(keyVariant);
+        member = object->addMember(savedKey, resources_);
+        if (!member)
+          return DeserializationError::NoMemory;
+      } else {
+        member = 0;
       }
 
       err = parseVariant(member, memberFilter, nestingLimit.decrement());

src/ArduinoJson/Object/ObjectData.hpp

@@ -10,11 +10,9 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 class ObjectData : public CollectionData {
  public:
-  template <typename TAdaptedString>
+  template <typename TAdaptedString>  // also works with StringNode*
   VariantData* addMember(TAdaptedString key, ResourceManager* resources);
 
-  VariantData* addPair(VariantData** value, ResourceManager* resources);
-
   template <typename TAdaptedString>
   VariantData* getOrAddMember(TAdaptedString key, ResourceManager* resources);
 

src/ArduinoJson/Object/ObjectImpl.hpp

@@ -68,22 +68,6 @@ inline VariantData* ObjectData::addMember(TAdaptedString key,
   return valueSlot.ptr();
 }
 
-inline VariantData* ObjectData::addPair(VariantData** value,
-                                        ResourceManager* resources) {
-  auto keySlot = resources->allocVariant();
-  if (!keySlot)
-    return nullptr;
-
-  auto valueSlot = resources->allocVariant();
-  if (!valueSlot)
-    return nullptr;
-  *value = valueSlot.ptr();
-
-  CollectionData::appendPair(keySlot, valueSlot, resources);
-
-  return keySlot.ptr();
-}
-
 // Returns the size (in bytes) of an object with n members.
 constexpr size_t sizeofObject(size_t n) {
   return 2 * n * ResourceManager::slotSize;

src/ArduinoJson/Strings/Adapters/RamString.hpp

@@ -76,16 +76,6 @@ struct StringAdapter<TChar*, enable_if_t<IsChar<TChar>::value>> {
   }
 };
 
-template <typename TChar>
-struct StringAdapter<TChar[], enable_if_t<IsChar<TChar>::value>> {
-  using AdaptedString = RamString;
-
-  static AdaptedString adapt(const TChar* p) {
-    auto str = reinterpret_cast<const char*>(p);
-    return AdaptedString(str, str ? ::strlen(str) : 0);
-  }
-};
-
 template <size_t N>
 struct StringAdapter<const char (&)[N]> {
   using AdaptedString = RamString;

src/ArduinoJson/Variant/ConverterImpl.hpp

@@ -230,9 +230,9 @@ class StringBuilderPrint : public Print {
     copier_.startString();
   }
 
-  void save(VariantData* data) {
+  StringNode* save() {
     ARDUINOJSON_ASSERT(!overflowed());
-    copier_.save(data);
+    return copier_.save();
   }
 
   size_t write(uint8_t c) {
@@ -268,7 +268,7 @@ inline void convertToJson(const ::Printable& src, JsonVariant dst) {
   src.printTo(print);
   if (print.overflowed())
     return;
-  print.save(data);
+  data->setOwnedString(print.save());
 }
 
 #endif

src/ArduinoJson/Variant/VariantContent.hpp

@@ -24,7 +24,6 @@ enum class VariantTypeBits : uint8_t {
 
 enum class VariantType : uint8_t {
   Null = 0,             // 0000 0000
-  TinyString = 0x02,    // 0000 0010
   RawString = 0x03,     // 0000 0011
   LinkedString = 0x04,  // 0000 0100
   OwnedString = 0x05,   // 0000 0101
@@ -47,8 +46,6 @@ inline bool operator&(VariantType type, VariantTypeBits bit) {
   return (uint8_t(type) & uint8_t(bit)) != 0;
 }
 
-const size_t tinyStringMaxLength = 3;
-
 union VariantContent {
   VariantContent() {}
 
@@ -61,7 +58,6 @@ union VariantContent {
   ObjectData asObject;
   CollectionData asCollection;
   struct StringNode* asOwnedString;
-  char asTinyString[tinyStringMaxLength + 1];
 };
 
 #if ARDUINOJSON_USE_EXTENSIONS

src/ArduinoJson/Variant/VariantData.hpp

@@ -17,16 +17,6 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 template <typename T>
 T parseNumber(const char* s);
 
-template <typename T>
-static bool isTinyString(const T& s, size_t n) {
-  if (n > tinyStringMaxLength)
-    return false;
-  bool containsNul = false;
-  for (uint8_t i = 0; i < uint8_t(n); i++)
-    containsNul |= !s[i];
-  return !containsNul;
-}
-
 class VariantData {
   VariantContent content_;  // must be first to allow cast from array to variant
   VariantType type_;
@@ -73,9 +63,6 @@ class VariantData {
       case VariantType::Object:
         return visit.visit(content_.asObject);
 
-      case VariantType::TinyString:
-        return visit.visit(JsonString(content_.asTinyString));
-
       case VariantType::LinkedString:
         return visit.visit(JsonString(asLinkedString(resources), true));
 
@@ -212,9 +199,6 @@ class VariantData {
       case VariantType::Int64:
         return static_cast<T>(extension->asInt64);
 #endif
-      case VariantType::TinyString:
-        str = content_.asTinyString;
-        break;
       case VariantType::LinkedString:
         str = asLinkedString(resources);
         break;
@@ -257,9 +241,6 @@ class VariantData {
       case VariantType::Int64:
         return convertNumber<T>(extension->asInt64);
 #endif
-      case VariantType::TinyString:
-        str = content_.asTinyString;
-        break;
       case VariantType::LinkedString:
         str = asLinkedString(resources);
         break;
@@ -302,8 +283,6 @@ class VariantData {
 
   JsonString asString(const ResourceManager* resources) const {
     switch (type_) {
-      case VariantType::TinyString:
-        return JsonString(content_.asTinyString);
       case VariantType::LinkedString:
         return JsonString(asLinkedString(resources), true);
       case VariantType::OwnedString:
@@ -418,8 +397,7 @@ class VariantData {
 
   bool isString() const {
     return type_ == VariantType::LinkedString ||
-           type_ == VariantType::OwnedString ||
-           type_ == VariantType::TinyString;
+           type_ == VariantType::OwnedString;
   }
 
   size_t nesting(const ResourceManager* resources) const {
@@ -512,6 +490,11 @@ class VariantData {
   template <typename TAdaptedString>
   bool setString(TAdaptedString value, ResourceManager* resources);
 
+  bool setString(StringNode* s, ResourceManager*) {
+    setOwnedString(s);
+    return true;
+  }
+
   template <typename TAdaptedString>
   static void setString(VariantData* var, TAdaptedString value,
                         ResourceManager* resources) {
@@ -523,23 +506,6 @@ class VariantData {
 
   bool setLinkedString(const char* s, ResourceManager* resources);
 
-  template <typename TAdaptedString>
-  void setTinyString(const TAdaptedString& s) {
-    ARDUINOJSON_ASSERT(type_ == VariantType::Null);  // must call clear() first
-    ARDUINOJSON_ASSERT(s.size() <= tinyStringMaxLength);
-
-    type_ = VariantType::TinyString;
-
-    auto n = uint8_t(s.size());
-    for (uint8_t i = 0; i < n; i++) {
-      char c = s[i];
-      ARDUINOJSON_ASSERT(c != 0);  // no NUL in tiny string
-      content_.asTinyString[i] = c;
-    }
-
-    content_.asTinyString[n] = 0;
-  }
-
   void setOwnedString(StringNode* s) {
     ARDUINOJSON_ASSERT(type_ == VariantType::Null);  // must call clear() first
     ARDUINOJSON_ASSERT(s);

src/ArduinoJson/Variant/VariantImpl.hpp

@@ -43,11 +43,6 @@ inline bool VariantData::setString(TAdaptedString value,
   if (value.isStatic())
     return setLinkedString(value.data(), resources);
 
-  if (isTinyString(value, value.size())) {
-    setTinyString(value);
-    return true;
-  }
-
   auto dup = resources->saveString(value);
   if (dup) {
     setOwnedString(dup);

src/ArduinoJson/version.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#define ARDUINOJSON_VERSION "7.4.1"
+#define ARDUINOJSON_VERSION "7.3.0"
 #define ARDUINOJSON_VERSION_MAJOR 7
-#define ARDUINOJSON_VERSION_MINOR 4
-#define ARDUINOJSON_VERSION_REVISION 1
-#define ARDUINOJSON_VERSION_MACRO V741
+#define ARDUINOJSON_VERSION_MINOR 3
+#define ARDUINOJSON_VERSION_REVISION 0
+#define ARDUINOJSON_VERSION_MACRO V730