From 23b01a89b1e1faf2fdee4b7287e769676b21852b Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Wed, 5 Jul 2023 16:18:35 +0200
Subject: [PATCH] Fix double lookup in `to<JsonVariant>()`

---
 CHANGELOG.md                            | 1 +
 src/ArduinoJson/Variant/JsonVariant.hpp | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0839d765..06661a37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,3 +15,4 @@ HEAD
 * Reference-count shared strings
 * Always store `serialized("string")` by copy (#1915)
 * Remove the zero-copy mode of `deserializeJson()` and `deserializeMsgPack()`
+* Fix double lookup in `to<JsonVariant>()`
diff --git a/src/ArduinoJson/Variant/JsonVariant.hpp b/src/ArduinoJson/Variant/JsonVariant.hpp
index 1d504d74..ed6635a0 100644
--- a/src/ArduinoJson/Variant/JsonVariant.hpp
+++ b/src/ArduinoJson/Variant/JsonVariant.hpp
@@ -105,8 +105,10 @@ template <typename TDerived>
 template <typename T>
 typename enable_if<is_same<T, JsonVariant>::value, JsonVariant>::type
 VariantRefBase<TDerived>::to() const {
-  detail::VariantData::setNull(getOrCreateData(), getResourceManager());
-  return *this;
+  auto data = getOrCreateData();
+  auto resources = getResourceManager();
+  detail::VariantData::setNull(data, resources);
+  return JsonVariant(data, resources);
 }
 
 template <typename TDerived>