Merge remote-tracking branch 'origin/develop' into develop

517aeec2 · Niels Lohmann · 3db8903f · 8f0a880c · 517aeec2 · 517aeec2
Unverified Commit 517aeec2 authored Jul 17, 2021 by Niels Lohmann
Showing with 50 additions and 44 deletions

include/nlohmann/detail/input/binary_reader.hpp include/nlohmann/detail/input/binary_reader.hpp +25 -22

single_include/nlohmann/json.hpp single_include/nlohmann/json.hpp +25 -22

No files found.
--- a/include/nlohmann/detail/input/binary_reader.hpp
+++ b/include/nlohmann/detail/input/binary_reader.hpp
@@ -1082,6 +1082,8 @@ class binary_reader
            return false;
        }

+        if (len != 0)
+        {
            string_t key;
            if (len != std::size_t(-1))
            {
@@ -1116,6 +1118,7 @@ class binary_reader
                    key.clear();
                }
            }
+        }

        return sax->end_object();
    }

--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -9298,6 +9298,8 @@ class binary_reader
            return false;
        }

+        if (len != 0)
+        {
            string_t key;
            if (len != std::size_t(-1))
            {
@@ -9332,6 +9334,7 @@ class binary_reader
                    key.clear();
                }
            }
+        }

        return sax->end_object();
    }