Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36da0e2f78 | ||
|
|
9da5272f6c | ||
|
|
b2674a4a2f | ||
|
|
e2423a1857 | ||
|
|
67b103e506 |
No files matched your search
@@ -24,7 +24,7 @@ jobs:
|
|||||||
permissions:
|
permissions:
|
||||||
actions: write
|
actions: write
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Harden Runner
|
- name: Harden Runner
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
save:
|
save:
|
||||||
if: github.event_name == 'pull_request'
|
if: github.event_name == 'pull_request'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
steps:
|
steps:
|
||||||
- name: Harden Runner
|
- name: Harden Runner
|
||||||
uses: step-security/harden-runner@dc2769abcc0fcfbadfc1df54081c1608579ef6b2 # v2.22.2
|
uses: step-security/harden-runner@dc2769abcc0fcfbadfc1df54081c1608579ef6b2 # v2.22.2
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
check_docs_links:
|
check_docs_links:
|
||||||
if: github.repository == 'nlohmann/json'
|
if: github.repository == 'nlohmann/json'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
steps:
|
steps:
|
||||||
- name: Harden Runner
|
- name: Harden Runner
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
comment:
|
comment:
|
||||||
# push runs on develop have no PR to comment on (and no "pr" artifact)
|
# push runs on develop have no PR to comment on (and no "pr" artifact)
|
||||||
if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}
|
if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
actions: read
|
actions: read
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
dependency-review:
|
dependency-review:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
steps:
|
steps:
|
||||||
- name: Harden Runner
|
- name: Harden Runner
|
||||||
uses: step-security/harden-runner@dc2769abcc0fcfbadfc1df54081c1608579ef6b2 # v2.22.2
|
uses: step-security/harden-runner@dc2769abcc0fcfbadfc1df54081c1608579ef6b2 # v2.22.2
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
flawfinder:
|
flawfinder:
|
||||||
name: Flawfinder
|
name: Flawfinder
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
permissions:
|
permissions:
|
||||||
actions: read
|
actions: read
|
||||||
contents: read
|
contents: read
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ jobs:
|
|||||||
contents: read
|
contents: read
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Harden Runner
|
- name: Harden Runner
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
if: github.repository == 'nlohmann/json'
|
if: github.repository == 'nlohmann/json'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
steps:
|
steps:
|
||||||
- name: Harden Runner
|
- name: Harden Runner
|
||||||
uses: step-security/harden-runner@dc2769abcc0fcfbadfc1df54081c1608579ef6b2 # v2.22.2
|
uses: step-security/harden-runner@dc2769abcc0fcfbadfc1df54081c1608579ef6b2 # v2.22.2
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
analysis:
|
analysis:
|
||||||
name: Scorecard analysis
|
name: Scorecard analysis
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
permissions:
|
permissions:
|
||||||
# Needed to upload the results to code-scanning dashboard.
|
# Needed to upload the results to code-scanning dashboard.
|
||||||
security-events: write
|
security-events: write
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
stale:
|
stale:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
issues: write
|
issues: write
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ concurrency:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ci_test_gcc:
|
ci_test_gcc:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
container: gcc:latest
|
container: gcc:latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
@@ -130,7 +130,7 @@ jobs:
|
|||||||
run: cmake --build build --target ${{ matrix.target }}
|
run: cmake --build build --target ${{ matrix.target }}
|
||||||
|
|
||||||
ci_static_analysis_clang:
|
ci_static_analysis_clang:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
container: silkeh/clang:22
|
container: silkeh/clang:22
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@@ -149,7 +149,7 @@ jobs:
|
|||||||
run: cmake --build build --target ${{ matrix.target }}
|
run: cmake --build build --target ${{ matrix.target }}
|
||||||
|
|
||||||
ci_cmake_options:
|
ci_cmake_options:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
container: ubuntu:24.04
|
container: ubuntu:24.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@@ -209,7 +209,7 @@ jobs:
|
|||||||
fail-on-error: false
|
fail-on-error: false
|
||||||
|
|
||||||
ci_test_compilers_gcc_old:
|
ci_test_compilers_gcc_old:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
compiler: ['4.8', '4.9', '5', '6']
|
compiler: ['4.8', '4.9', '5', '6']
|
||||||
@@ -251,7 +251,7 @@ jobs:
|
|||||||
run: cmake --build build --target ci_test_compiler_g++-${{ matrix.compiler }}
|
run: cmake --build build --target ci_test_compiler_g++-${{ matrix.compiler }}
|
||||||
|
|
||||||
ci_test_compilers_gcc:
|
ci_test_compilers_gcc:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
# older GCC docker images (4, 5, 6) fail to check out code
|
# older GCC docker images (4, 5, 6) fail to check out code
|
||||||
@@ -269,7 +269,7 @@ jobs:
|
|||||||
run: cmake --build build --target ci_test_compiler_default
|
run: cmake --build build --target ci_test_compiler_default
|
||||||
|
|
||||||
ci_test_compilers_clang:
|
ci_test_compilers_clang:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
compiler: ['3.4', '3.5', '3.6', '3.7', '3.8', '3.9', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15-bullseye', '16', '17', '18', '19', '20', '21', '22', 'latest']
|
compiler: ['3.4', '3.5', '3.6', '3.7', '3.8', '3.9', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15-bullseye', '16', '17', '18', '19', '20', '21', '22', 'latest']
|
||||||
@@ -289,7 +289,7 @@ jobs:
|
|||||||
run: cmake --build build --target ci_test_compiler_default
|
run: cmake --build build --target ci_test_compiler_default
|
||||||
|
|
||||||
ci_test_standards_gcc:
|
ci_test_standards_gcc:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
container: gcc:latest
|
container: gcc:latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@@ -306,7 +306,7 @@ jobs:
|
|||||||
run: cmake --build build --target ci_test_gcc_cxx${{ matrix.standard }}
|
run: cmake --build build --target ci_test_gcc_cxx${{ matrix.standard }}
|
||||||
|
|
||||||
ci_test_standards_clang:
|
ci_test_standards_clang:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
container: silkeh/clang:latest
|
container: silkeh/clang:latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@@ -330,7 +330,7 @@ jobs:
|
|||||||
if: ${{ matrix.stdlib == 'libstdcxx' }}
|
if: ${{ matrix.stdlib == 'libstdcxx' }}
|
||||||
|
|
||||||
ci_cuda_example:
|
ci_cuda_example:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -356,7 +356,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
container: ['gcc:latest', 'silkeh/clang:latest']
|
container: ['gcc:latest', 'silkeh/clang:latest']
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
container: ${{ matrix.container }}
|
container: ${{ matrix.container }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
@@ -383,7 +383,7 @@ jobs:
|
|||||||
run: cmake --build build --target ci_module_cpp20
|
run: cmake --build build --target ci_module_cpp20
|
||||||
|
|
||||||
ci_icpc:
|
ci_icpc:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
# Intel discontinued the classic icc/icpc compiler in oneAPI 2024.0; this is
|
# Intel discontinued the classic icc/icpc compiler in oneAPI 2024.0; this is
|
||||||
# Intel's own last officially published image that still includes it.
|
# Intel's own last officially published image that still includes it.
|
||||||
container: intel/oneapi-hpckit:2023.2.1-devel-ubuntu22.04
|
container: intel/oneapi-hpckit:2023.2.1-devel-ubuntu22.04
|
||||||
@@ -402,7 +402,7 @@ jobs:
|
|||||||
run: cmake --build build --target ci_icpc
|
run: cmake --build build --target ci_icpc
|
||||||
|
|
||||||
ci_icpx:
|
ci_icpx:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
container: intel/oneapi-hpckit:latest
|
container: intel/oneapi-hpckit:latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
@@ -416,7 +416,7 @@ jobs:
|
|||||||
run: cmake --build build --target ci_icpx
|
run: cmake --build build --target ci_icpx
|
||||||
|
|
||||||
ci_nvhpc:
|
ci_nvhpc:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-26.04
|
||||||
container: nvcr.io/nvidia/nvhpc:25.5-devel-cuda12.9-ubuntu22.04
|
container: nvcr.io/nvidia/nvhpc:25.5-devel-cuda12.9-ubuntu22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|||||||
@@ -406,6 +406,7 @@ using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
|
|||||||
| `#!cpp operator<<(std::ostream&, const json_pointer&)` | streamability to `#!cpp std::ostream` |
|
| `#!cpp operator<<(std::ostream&, const json_pointer&)` | streamability to `#!cpp std::ostream` |
|
||||||
| [`to_string`](../../api/basic_json/to_string.md) | conversion of `StringType` to `#!cpp std::string` (the function returns a `#!cpp std::string`) |
|
| [`to_string`](../../api/basic_json/to_string.md) | conversion of `StringType` to `#!cpp std::string` (the function returns a `#!cpp std::string`) |
|
||||||
| exception messages | `data()` and `size()`, or `begin()` and `end()` |
|
| exception messages | `data()` and `size()`, or `begin()` and `end()` |
|
||||||
|
| [`basic_json_view::dump`](../../api/basic_json_view/dump.md) | `reserve(n)` and `resize(n)` (one argument); `capacity()` is **not** required |
|
||||||
|
|
||||||
### Compatible types
|
### Compatible types
|
||||||
|
|
||||||
|
|||||||
@@ -467,11 +467,13 @@ class binary_reader
|
|||||||
|
|
||||||
const std::size_t element_type_parse_position = chars_read;
|
const std::size_t element_type_parse_position = chars_read;
|
||||||
// an array's elements are named "0", "1", ... in the wire format,
|
// an array's elements are named "0", "1", ... in the wire format,
|
||||||
// and those names are not passed on: they are skipped unless
|
// and those names are not passed on: they are skipped, and only
|
||||||
// error_handler_t::strict must reject ill-formed UTF-8 in them
|
// checked if error_handler_t::strict must reject ill-formed UTF-8
|
||||||
const bool is_object = container_stack.back().is_object;
|
const bool is_object = container_stack.back().is_object;
|
||||||
key.clear();
|
key.clear();
|
||||||
if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key, is_object || error_handler == error_handler_t::strict)))
|
if (JSON_HEDLEY_UNLIKELY(!(is_object || error_handler != error_handler_t::strict
|
||||||
|
? get_bson_cstr(key, is_object)
|
||||||
|
: check_bson_cstr(key, std::integral_constant<bool, bulk_scan> {}))))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -495,7 +497,7 @@ class binary_reader
|
|||||||
@param[in] store whether the characters are needed; if not (the names of
|
@param[in] store whether the characters are needed; if not (the names of
|
||||||
an array's elements), they are skipped and @a result may
|
an array's elements), they are skipped and @a result may
|
||||||
be left unchanged, and they are not checked against
|
be left unchanged, and they are not checked against
|
||||||
@ref error_handler
|
@ref error_handler (@ref check_bson_cstr checks them)
|
||||||
@return `true` if the \\x00-byte indicating the end of the string was
|
@return `true` if the \\x00-byte indicating the end of the string was
|
||||||
encountered before the EOF; false` indicates an unexpected EOF.
|
encountered before the EOF; false` indicates an unexpected EOF.
|
||||||
*/
|
*/
|
||||||
@@ -554,6 +556,42 @@ class binary_reader
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
@brief skip a C-style string that error_handler_t::strict must check
|
||||||
|
|
||||||
|
The names of an array's elements are not passed on. On contiguous input,
|
||||||
|
a well-formed name is checked in place and skipped without being copied.
|
||||||
|
Otherwise (no \\x00-byte in the input that can be scanned, or ill-formed
|
||||||
|
UTF-8), it is read by @ref get_bson_cstr, which reports the error.
|
||||||
|
|
||||||
|
@param[in,out] result an empty string, which may receive the name
|
||||||
|
@return whether the name was read and is well-formed
|
||||||
|
*/
|
||||||
|
bool check_bson_cstr(string_t& result, std::true_type /*bulk*/)
|
||||||
|
{
|
||||||
|
const std::size_t remaining = ia.bulk_remaining();
|
||||||
|
if (remaining != 0)
|
||||||
|
{
|
||||||
|
const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data());
|
||||||
|
const std::size_t length = find_zero_byte(data, remaining);
|
||||||
|
if (length != remaining && JSON_HEDLEY_LIKELY(valid_utf8_string(data, length)))
|
||||||
|
{
|
||||||
|
// consume the string and its \x00-byte, as get_bson_cstr does
|
||||||
|
ia.bulk_skip(length + 1);
|
||||||
|
chars_read += length + 1;
|
||||||
|
current = 0x00;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return get_bson_cstr(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// input that is not contiguous: the name is read and checked byte by byte
|
||||||
|
bool check_bson_cstr(string_t& result, std::false_type /*bulk*/)
|
||||||
|
{
|
||||||
|
return get_bson_cstr(result);
|
||||||
|
}
|
||||||
|
|
||||||
/// input that is not contiguous: C-style strings are read byte by byte
|
/// input that is not contiguous: C-style strings are read byte by byte
|
||||||
bool get_bson_cstr_bulk(string_t& /*result*/, const bool /*store*/, std::false_type /*bulk*/) const noexcept
|
bool get_bson_cstr_bulk(string_t& /*result*/, const bool /*store*/, std::false_type /*bulk*/) const noexcept
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ class output_buffer
|
|||||||
: m_out(sized(out, estimate))
|
: m_out(sized(out, estimate))
|
||||||
, m_pos(&m_out[0])
|
, m_pos(&m_out[0])
|
||||||
, m_end(m_pos + m_out.size())
|
, m_end(m_pos + m_out.size())
|
||||||
|
, m_reserved((std::max)(estimate, m_out.size()))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
void finish()
|
void finish()
|
||||||
@@ -116,11 +117,12 @@ class output_buffer
|
|||||||
const auto used = static_cast<std::size_t>(m_pos - m_out.data());
|
const auto used = static_cast<std::size_t>(m_pos - m_out.data());
|
||||||
// (a step does not go beyond the reserved estimate, so that a good
|
// (a step does not go beyond the reserved estimate, so that a good
|
||||||
// estimate is never copied to a larger allocation; not a clamp: the
|
// estimate is never copied to a larger allocation; not a clamp: the
|
||||||
// lower bound used + n + 256 can exceed capacity(), and then it must win)
|
// lower bound used + n + 256 can exceed m_reserved, and then it must win)
|
||||||
const std::size_t size = (std::max)((std::min)(m_out.size() + step, m_out.capacity()), used + n + 256);
|
const std::size_t size = (std::max)((std::min)(m_out.size() + step, m_reserved), used + n + 256);
|
||||||
if (size > m_out.capacity())
|
if (size > m_reserved)
|
||||||
{
|
{
|
||||||
m_out.reserve((std::max)(m_out.capacity() * 2, size));
|
m_reserved = (std::max)(m_reserved * 2, size);
|
||||||
|
m_out.reserve(m_reserved);
|
||||||
}
|
}
|
||||||
m_out.resize(size);
|
m_out.resize(size);
|
||||||
m_pos = &m_out[0] + used;
|
m_pos = &m_out[0] + used;
|
||||||
@@ -130,6 +132,9 @@ class output_buffer
|
|||||||
StringType& m_out;
|
StringType& m_out;
|
||||||
char* m_pos;
|
char* m_pos;
|
||||||
char* m_end;
|
char* m_end;
|
||||||
|
/// what was last passed to reserve(), a lower bound of the capacity
|
||||||
|
/// (StringType need not have a capacity() member)
|
||||||
|
std::size_t m_reserved;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// The length of the run at s that dump() writes unchanged without
|
/// The length of the run at s that dump() writes unchanged without
|
||||||
|
|||||||
Generated
+42
-4
@@ -18474,11 +18474,13 @@ class binary_reader
|
|||||||
|
|
||||||
const std::size_t element_type_parse_position = chars_read;
|
const std::size_t element_type_parse_position = chars_read;
|
||||||
// an array's elements are named "0", "1", ... in the wire format,
|
// an array's elements are named "0", "1", ... in the wire format,
|
||||||
// and those names are not passed on: they are skipped unless
|
// and those names are not passed on: they are skipped, and only
|
||||||
// error_handler_t::strict must reject ill-formed UTF-8 in them
|
// checked if error_handler_t::strict must reject ill-formed UTF-8
|
||||||
const bool is_object = container_stack.back().is_object;
|
const bool is_object = container_stack.back().is_object;
|
||||||
key.clear();
|
key.clear();
|
||||||
if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key, is_object || error_handler == error_handler_t::strict)))
|
if (JSON_HEDLEY_UNLIKELY(!(is_object || error_handler != error_handler_t::strict
|
||||||
|
? get_bson_cstr(key, is_object)
|
||||||
|
: check_bson_cstr(key, std::integral_constant<bool, bulk_scan> {}))))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -18502,7 +18504,7 @@ class binary_reader
|
|||||||
@param[in] store whether the characters are needed; if not (the names of
|
@param[in] store whether the characters are needed; if not (the names of
|
||||||
an array's elements), they are skipped and @a result may
|
an array's elements), they are skipped and @a result may
|
||||||
be left unchanged, and they are not checked against
|
be left unchanged, and they are not checked against
|
||||||
@ref error_handler
|
@ref error_handler (@ref check_bson_cstr checks them)
|
||||||
@return `true` if the \\x00-byte indicating the end of the string was
|
@return `true` if the \\x00-byte indicating the end of the string was
|
||||||
encountered before the EOF; false` indicates an unexpected EOF.
|
encountered before the EOF; false` indicates an unexpected EOF.
|
||||||
*/
|
*/
|
||||||
@@ -18561,6 +18563,42 @@ class binary_reader
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
@brief skip a C-style string that error_handler_t::strict must check
|
||||||
|
|
||||||
|
The names of an array's elements are not passed on. On contiguous input,
|
||||||
|
a well-formed name is checked in place and skipped without being copied.
|
||||||
|
Otherwise (no \\x00-byte in the input that can be scanned, or ill-formed
|
||||||
|
UTF-8), it is read by @ref get_bson_cstr, which reports the error.
|
||||||
|
|
||||||
|
@param[in,out] result an empty string, which may receive the name
|
||||||
|
@return whether the name was read and is well-formed
|
||||||
|
*/
|
||||||
|
bool check_bson_cstr(string_t& result, std::true_type /*bulk*/)
|
||||||
|
{
|
||||||
|
const std::size_t remaining = ia.bulk_remaining();
|
||||||
|
if (remaining != 0)
|
||||||
|
{
|
||||||
|
const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data());
|
||||||
|
const std::size_t length = find_zero_byte(data, remaining);
|
||||||
|
if (length != remaining && JSON_HEDLEY_LIKELY(valid_utf8_string(data, length)))
|
||||||
|
{
|
||||||
|
// consume the string and its \x00-byte, as get_bson_cstr does
|
||||||
|
ia.bulk_skip(length + 1);
|
||||||
|
chars_read += length + 1;
|
||||||
|
current = 0x00;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return get_bson_cstr(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// input that is not contiguous: the name is read and checked byte by byte
|
||||||
|
bool check_bson_cstr(string_t& result, std::false_type /*bulk*/)
|
||||||
|
{
|
||||||
|
return get_bson_cstr(result);
|
||||||
|
}
|
||||||
|
|
||||||
/// input that is not contiguous: C-style strings are read byte by byte
|
/// input that is not contiguous: C-style strings are read byte by byte
|
||||||
bool get_bson_cstr_bulk(string_t& /*result*/, const bool /*store*/, std::false_type /*bulk*/) const noexcept
|
bool get_bson_cstr_bulk(string_t& /*result*/, const bool /*store*/, std::false_type /*bulk*/) const noexcept
|
||||||
{
|
{
|
||||||
|
|||||||
Generated
+9
-4
@@ -8511,6 +8511,7 @@ class output_buffer
|
|||||||
: m_out(sized(out, estimate))
|
: m_out(sized(out, estimate))
|
||||||
, m_pos(&m_out[0])
|
, m_pos(&m_out[0])
|
||||||
, m_end(m_pos + m_out.size())
|
, m_end(m_pos + m_out.size())
|
||||||
|
, m_reserved((std::max)(estimate, m_out.size()))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
void finish()
|
void finish()
|
||||||
@@ -8580,11 +8581,12 @@ class output_buffer
|
|||||||
const auto used = static_cast<std::size_t>(m_pos - m_out.data());
|
const auto used = static_cast<std::size_t>(m_pos - m_out.data());
|
||||||
// (a step does not go beyond the reserved estimate, so that a good
|
// (a step does not go beyond the reserved estimate, so that a good
|
||||||
// estimate is never copied to a larger allocation; not a clamp: the
|
// estimate is never copied to a larger allocation; not a clamp: the
|
||||||
// lower bound used + n + 256 can exceed capacity(), and then it must win)
|
// lower bound used + n + 256 can exceed m_reserved, and then it must win)
|
||||||
const std::size_t size = (std::max)((std::min)(m_out.size() + step, m_out.capacity()), used + n + 256);
|
const std::size_t size = (std::max)((std::min)(m_out.size() + step, m_reserved), used + n + 256);
|
||||||
if (size > m_out.capacity())
|
if (size > m_reserved)
|
||||||
{
|
{
|
||||||
m_out.reserve((std::max)(m_out.capacity() * 2, size));
|
m_reserved = (std::max)(m_reserved * 2, size);
|
||||||
|
m_out.reserve(m_reserved);
|
||||||
}
|
}
|
||||||
m_out.resize(size);
|
m_out.resize(size);
|
||||||
m_pos = &m_out[0] + used;
|
m_pos = &m_out[0] + used;
|
||||||
@@ -8594,6 +8596,9 @@ class output_buffer
|
|||||||
StringType& m_out;
|
StringType& m_out;
|
||||||
char* m_pos;
|
char* m_pos;
|
||||||
char* m_end;
|
char* m_end;
|
||||||
|
/// what was last passed to reserve(), a lower bound of the capacity
|
||||||
|
/// (StringType need not have a capacity() member)
|
||||||
|
std::size_t m_reserved;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// The length of the run at s that dump() writes unchanged without
|
/// The length of the run at s that dump() writes unchanged without
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
#include "doctest_compatibility.h"
|
#include "doctest_compatibility.h"
|
||||||
|
|
||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
|
#include <nlohmann/json_view.hpp>
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -483,4 +484,56 @@ TEST_CASE("alternative string type")
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_CASE("alternative string type with json_view")
|
||||||
|
{
|
||||||
|
// regression test for #5994: basic_json_view::dump() called
|
||||||
|
// StringType::capacity(), which alt_string (and the documented StringType
|
||||||
|
// requirements) do not provide
|
||||||
|
using alt_document = nlohmann::basic_json_document<alt_json, nlohmann::view_mode::read_only>;
|
||||||
|
using alt_editable_document = nlohmann::basic_json_document<alt_json, nlohmann::view_mode::editable>;
|
||||||
|
|
||||||
|
const char* text = R"({"a":[1,"x\u00e4"],"b":{"c":true,"d":null},"e":2.5})";
|
||||||
|
const alt_json j = alt_json::parse(text);
|
||||||
|
|
||||||
|
SECTION("read-only document")
|
||||||
|
{
|
||||||
|
const alt_document d = alt_document::parse(text);
|
||||||
|
CHECK(d.root().dump() == j.dump());
|
||||||
|
CHECK(d.root().dump(2) == j.dump(2));
|
||||||
|
CHECK(d.root().dump(-1, ' ', true) == j.dump(-1, ' ', true));
|
||||||
|
CHECK(d.root().materialize() == j);
|
||||||
|
CHECK(d.root().contains(alt_string("b")));
|
||||||
|
CHECK(d.root()[alt_string("b")][alt_string("c")].dump() == "true");
|
||||||
|
}
|
||||||
|
|
||||||
|
SECTION("long output")
|
||||||
|
{
|
||||||
|
// more than one growth step of the output buffer
|
||||||
|
alt_json big = alt_json::array();
|
||||||
|
for (int i = 0; i < 20000; ++i)
|
||||||
|
{
|
||||||
|
big.push_back(alt_json::parse(text));
|
||||||
|
}
|
||||||
|
const alt_string big_text = big.dump();
|
||||||
|
const alt_document d = alt_document::parse(big_text);
|
||||||
|
CHECK(d.root().dump() == big_text);
|
||||||
|
CHECK(d.root().dump(4) == big.dump(4));
|
||||||
|
}
|
||||||
|
|
||||||
|
SECTION("editable document")
|
||||||
|
{
|
||||||
|
alt_editable_document d = alt_editable_document::parse(text);
|
||||||
|
d.set(d.root(), "f", "new");
|
||||||
|
d.push_back(d.root()[alt_string("a")], 3);
|
||||||
|
alt_json expected = j;
|
||||||
|
expected["f"] = "new";
|
||||||
|
expected["a"].push_back(3);
|
||||||
|
CHECK(d.root().materialize() == expected);
|
||||||
|
CHECK(alt_json::parse(d.root().dump()) == expected);
|
||||||
|
|
||||||
|
const alt_editable_document loaded = alt_editable_document::load(d.save());
|
||||||
|
CHECK(loaded.root().materialize() == expected);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
DOCTEST_CLANG_SUPPRESS_WARNING_POP
|
DOCTEST_CLANG_SUPPRESS_WARNING_POP
|
||||||
@@ -23,6 +23,7 @@ using nlohmann::json;
|
|||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
#include <list>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "make_test_data_available.hpp"
|
#include "make_test_data_available.hpp"
|
||||||
@@ -1199,6 +1200,31 @@ TEST_CASE("BSON keys from contiguous and stream input")
|
|||||||
from_stream = e.what();
|
from_stream = e.what();
|
||||||
}
|
}
|
||||||
CHECK(from_vector == from_stream);
|
CHECK(from_vector == from_stream);
|
||||||
|
|
||||||
|
// error_handler_t::strict checks the array element names in place on
|
||||||
|
// contiguous input and byte by byte otherwise; the names are
|
||||||
|
// well-formed, so both give the same value or error as above
|
||||||
|
std::string strict_from_vector;
|
||||||
|
std::string strict_from_list;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
strict_from_vector = json::from_bson(input, true, true, json::error_handler_t::strict).dump();
|
||||||
|
}
|
||||||
|
catch (const json::parse_error& e)
|
||||||
|
{
|
||||||
|
strict_from_vector = e.what();
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
|
const std::list<std::uint8_t> list(input.begin(), input.end());
|
||||||
|
strict_from_list = json::from_bson(list.begin(), list.end(), true, true, json::error_handler_t::strict).dump();
|
||||||
|
}
|
||||||
|
catch (const json::parse_error& e)
|
||||||
|
{
|
||||||
|
strict_from_list = e.what();
|
||||||
|
}
|
||||||
|
CHECK(strict_from_vector == from_vector);
|
||||||
|
CHECK(strict_from_list == from_vector);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1227,6 +1253,18 @@ TEST_CASE("BSON array element names")
|
|||||||
|
|
||||||
std::istringstream stream(std::string(reinterpret_cast<const char*>(bson.data()), bson.size()));
|
std::istringstream stream(std::string(reinterpret_cast<const char*>(bson.data()), bson.size()));
|
||||||
CHECK(json::from_bson(stream) == expected);
|
CHECK(json::from_bson(stream) == expected);
|
||||||
|
|
||||||
|
// input that is not contiguous reads the names byte by byte and must reject
|
||||||
|
// the same name
|
||||||
|
const std::list<std::uint8_t> list(bson.begin(), bson.end());
|
||||||
|
CHECK_THROWS_WITH_AS(_ = json::from_bson(list.begin(), list.end(), true, true, json::error_handler_t::strict), "[json.exception.parse_error.113] parse error at byte 14: syntax error while parsing BSON key: invalid string: ill-formed UTF-8 byte", json::parse_error&);
|
||||||
|
|
||||||
|
// without exceptions, the rejected name ends the parse
|
||||||
|
CHECK(json::from_bson(bson, true, false, json::error_handler_t::strict).is_discarded());
|
||||||
|
|
||||||
|
// well-formed names pass the check without being stored
|
||||||
|
const json valid = {{"a", {true, false, {{"k", json::array({1, 2})}}}}};
|
||||||
|
CHECK(json::from_bson(json::to_bson(valid), true, true, json::error_handler_t::strict) == valid);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -692,7 +692,7 @@ TEST_CASE("json_view builder: fraction digits")
|
|||||||
check_same(number);
|
check_same(number);
|
||||||
check_same("[" + number + "]");
|
check_same("[" + number + "]");
|
||||||
std::string pair;
|
std::string pair;
|
||||||
pair.reserve(number.size() * 2 + 3);
|
pair.reserve((number.size() * 2) + 3);
|
||||||
pair += '[';
|
pair += '[';
|
||||||
pair += number;
|
pair += number;
|
||||||
pair += ',';
|
pair += ',';
|
||||||
|
|||||||
@@ -521,7 +521,8 @@ TEST_CASE("json_view exceptions name the path and the bytes of the value")
|
|||||||
std::string text = "7";
|
std::string text = "7";
|
||||||
for (int level = 0; level < 40; ++level)
|
for (int level = 0; level < 40; ++level)
|
||||||
{
|
{
|
||||||
text = R"([[1, [2]], )" + text + R"(, {"k": [3, {"l": [4]}]}, [5, [6, [7]]]])";
|
text.insert(0, R"([[1, [2]], )");
|
||||||
|
text += R"(, {"k": [3, {"l": [4]}]}, [5, [6, [7]]]])";
|
||||||
}
|
}
|
||||||
CAPTURE(text)
|
CAPTURE(text)
|
||||||
const json j = json::parse(text);
|
const json j = json::parse(text);
|
||||||
|
|||||||
Reference in new issue
Block a user