BSON: Fixed array serialization by adding increasing integral names to the array elements

Author: julian-becker

include/nlohmann/detail/output/binary_writer.hpp

@@ -837,10 +837,10 @@ class binary_writer
     static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
     {
         std::size_t embedded_document_size = 0ul;
-
+        std::size_t i = 0ull;
         for (const auto& el : value)
         {
-            embedded_document_size += calc_bson_element_size("", el);
+            embedded_document_size += calc_bson_element_size(std::to_string(i++), el);
         }
 
         return sizeof(std::int32_t) + embedded_document_size + 1ul;
@@ -854,9 +854,10 @@ class binary_writer
         write_bson_entry_header(name, 0x04); // array
         write_number<std::int32_t, true>(calc_bson_array_size(value));
 
+        std::size_t i = 0ull;
         for (const auto& el : value)
         {
-            write_bson_element("", el);
+            write_bson_element(std::to_string(i++), el);
         }
 
         oa->write_character(static_cast<CharType>(0x00));

single_include/nlohmann/json.hpp

@@ -8994,10 +8994,10 @@ class binary_writer
     static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
     {
         std::size_t embedded_document_size = 0ul;
-
+        std::size_t i = 0ull;
         for (const auto& el : value)
         {
-            embedded_document_size += calc_bson_element_size("", el);
+            embedded_document_size += calc_bson_element_size(std::to_string(i++), el);
         }
 
         return sizeof(std::int32_t) + embedded_document_size + 1ul;
@@ -9011,9 +9011,10 @@ class binary_writer
         write_bson_entry_header(name, 0x04); // array
         write_number<std::int32_t, true>(calc_bson_array_size(value));
 
+        std::size_t i = 0ull;
         for (const auto& el : value)
         {
-            write_bson_element("", el);
+            write_bson_element(std::to_string(i++), el);
         }
 
         oa->write_character(static_cast<CharType>(0x00));

test/data/json_testsuite/README.md

@@ -4,6 +4,8 @@
 
 https://code.google.com/p/json-test-suite/downloads/detail?name=sample.zip&can=2&q=
 
+The file sample_cstr_keys.json has been copied from sample.json and modified by removing all U+0000 code points from all the keys.
+
 ## License
 
 Apache License Version 2.0