Done

Author: bblanchon

src/ArduinoJson/Array/ArrayImpl.hpp

@@ -76,22 +76,6 @@ inline void VariantImpl::removeElement(size_t index) {
   removeElement(at(index));
 }
 
-template <typename T>
-inline bool VariantImpl::addValue(const T& value) {
-  if (!isArray())
-    return false;
-  auto slot = allocVariant();
-  if (!slot)
-    return false;
-  JsonVariant variant(slot.ptr(), resources_);
-  if (!variant.set(value)) {
-    freeVariant(slot);
-    return false;
-  }
-  appendOne(slot);
-  return true;
-}
-
 inline bool VariantImpl::copyArray(const VariantImpl& src) {
   ARDUINOJSON_ASSERT(isNull());
 
@@ -102,12 +86,16 @@ inline bool VariantImpl::copyArray(const VariantImpl& src) {
 
   for (auto it = src.createIterator(); !it.done(); it.move()) {
     auto slot = allocVariant();
-    auto element = VariantImpl(slot.ptr(), resources_);
+    if (!slot)
+      return false;
+
+    VariantImpl element(slot.ptr(), resources_);
     if (!element.copyVariant(*it)) {
       freeVariant(slot);
       return false;
     }
-    appendOne(slot);
+
+    addElement(slot);
   }
 
   return true;

src/ArduinoJson/Array/JsonArray.hpp

@@ -90,9 +90,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   // https://arduinojson.org/v7/api/jsonarray/set/
   bool set(JsonArrayConst src) const {
     impl_.clear();
-    if (src.isNull())
-      return true;
-    return impl_.copyCollection(detail::VariantAttorney::getImpl(src));
+    return impl_.copyArray(detail::VariantAttorney::getImpl(src));
   }
 
   // Removes the element at the specified iterator.

src/ArduinoJson/Object/JsonObject.hpp

@@ -83,10 +83,11 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   // Copies an object.
   // https://arduinojson.org/v7/api/jsonobject/set/
   bool set(JsonObjectConst src) {
+    if (isNull() ||
+        src.isNull())  // TODO: this check is not consistent with JsonArray
+      return false;
     impl_.clear();
-    if (src.isNull())
-      return true;
-    return impl_.copyCollection(detail::VariantAttorney::getImpl(src));
+    return impl_.copyObject(detail::VariantAttorney::getImpl(src));
   }
 
   // Gets or sets the member with specified key.

src/ArduinoJson/Object/ObjectImpl.hpp

@@ -9,6 +9,46 @@
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
+inline bool VariantImpl::copyObject(const VariantImpl& src) {
+  ARDUINOJSON_ASSERT(isNull());
+
+  if (!data_)
+    return false;
+
+  data_->toObject();
+
+  for (auto it = src.createIterator(); !it.done(); it.move()) {
+    auto keySlot = allocVariant();
+    if (!keySlot)
+      return false;
+
+    auto key = VariantImpl(keySlot.ptr(), resources_);
+    if (!key.copyVariant(*it)) {
+      freeVariant(keySlot);
+      return false;
+    }
+
+    it.move();  // move to value
+    ARDUINOJSON_ASSERT(!it.done());
+
+    auto valueSlot = allocVariant();
+    if (!valueSlot) {
+      freeVariant(keySlot);
+      return false;
+    }
+
+    // TODO: we add the pair before copying the value to be keep the old
+    // behavior but this is not consistent with issue #2081
+    appendPair(keySlot, valueSlot);
+
+    auto value = VariantImpl(valueSlot.ptr(), resources_);
+    if (!value.copyVariant(*it))
+      return false;
+  }
+
+  return true;
+}
+
 template <typename TAdaptedString>
 inline VariantData* VariantImpl::getMember(TAdaptedString key) const {
   auto it = findKey(key);

src/ArduinoJson/Variant/VariantImpl.hpp

@@ -354,20 +354,16 @@ class VariantImpl {
 
   void removeMember(iterator it);
 
-  bool copyArray(const VariantImpl& src) {
-    if (!src.isArray())
-      return false;
-    return copyCollection(src);
-  }
-
   bool copyVariant(const VariantImpl& src) {
     switch (src.type()) {
       case VariantType::Null:
         return true;
 
       case VariantType::Array:
+        return copyArray(src);
+
       case VariantType::Object:
-        return copyCollection(src);
+        return copyObject(src);
 
       case VariantType::RawString:
         return setRawString(adaptString(src.asRawString()));
@@ -379,12 +375,14 @@ class VariantImpl {
         return setOwnedString(adaptString(src.asString()));
 
       default:
-        *data_ = *src.data_;
+        data_->content = src.data_->content;
+        data_->type = src.data_->type;
         return true;
     }
   }
 
-  bool copyCollection(const VariantImpl& src);
+  bool copyArray(const VariantImpl& src);
+  bool copyObject(const VariantImpl& src);
 
   bool setBoolean(bool value) {
     if (!data_)