mirror of
https://github.com/nlohmann/json.git
synced 2026-11-19 17:55:20 +00:00
Merge branch 'develop' into issue-5405-binary-reader-reserve
Resolves conflicting test-case insertions in tests/src/unit-cbor.cpp and tests/src/unit-ubjson.cpp: both branches independently appended a new TEST_CASE near the end of each file. Keep both -- the #5405 array-reserve regression tests from this branch, and develop's unrelated call-stack-depth / indefinite-length-string hardening tests. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
74 files changed
+9934
-4155
No files matched your search
+3055
-636
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user