From 555ef48fb6c68d977ad7c7fe79d7beb6e83df43b Mon Sep 17 00:00:00 2001 From: Anshika Grover <64095946+anshikagrover15@users.noreply.github.com> Date: Thu, 19 Nov 2026 03:13:28 +0530 Subject: [PATCH] Fix reverse iterator subscript exception for objects (#6125) * Fix reverse iterator subscript exception for objects Signed-off-by: Anshika Grover * Add reverse iterator subscript tests and comment Signed-off-by: Anshika Grover * Add primitive reverse iterator subscript tests Signed-off-by: Anshika Grover --------- Signed-off-by: Anshika Grover --- .../detail/iterators/json_reverse_iterator.hpp | 4 +++- single_include/nlohmann/json.hpp | 4 +++- tests/src/unit-iterators2.cpp | 15 +++++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/nlohmann/detail/iterators/json_reverse_iterator.hpp b/include/nlohmann/detail/iterators/json_reverse_iterator.hpp index d718901ae2..f8c0786768 100644 --- a/include/nlohmann/detail/iterators/json_reverse_iterator.hpp +++ b/include/nlohmann/detail/iterators/json_reverse_iterator.hpp @@ -108,7 +108,9 @@ class json_reverse_iterator : public std::reverse_iterator /// access to successor reference operator[](difference_type n) const { - return *(this->operator+(n)); + // the element n positions after *this is the one n + 1 positions before base(); + // Base::operator[] then reports invalid_iterator.208 for object iterators + return this->base()[-n - 1]; } /// return the key of an object iterator diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index f040c90ab2..d6a4f1c94b 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -26795,7 +26795,9 @@ class json_reverse_iterator : public std::reverse_iterator /// access to successor reference operator[](difference_type n) const { - return *(this->operator+(n)); + // the element n positions after *this is the one n + 1 positions before base(); + // Base::operator[] then reports invalid_iterator.208 for object iterators + return this->base()[-n - 1]; } /// return the key of an object iterator diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp index 67a5752e4f..54e316c69a 100644 --- a/tests/src/unit-iterators2.cpp +++ b/tests/src/unit-iterators2.cpp @@ -830,13 +830,13 @@ TEST_CASE("iterators 2") { { auto it = j_object.rbegin(); - CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&); - CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&); + CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&); + CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&); } { auto it = j_object.crbegin(); - CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&); - CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&); + CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&); + CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&); } } @@ -850,6 +850,7 @@ TEST_CASE("iterators 2") CHECK(it[3] == json(3)); CHECK(it[4] == json(2)); CHECK(it[5] == json(1)); + CHECK((j_array.rbegin() + 2)[1] == json(3)); } { auto it = j_array.crbegin(); @@ -859,6 +860,7 @@ TEST_CASE("iterators 2") CHECK(it[3] == json(3)); CHECK(it[4] == json(2)); CHECK(it[5] == json(1)); + CHECK((j_array.crbegin() + 2)[3] == json(1)); } } @@ -888,6 +890,11 @@ TEST_CASE("iterators 2") CHECK(it[0] == json(42)); CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&); } + CHECK(json(1).rbegin()[0] == json(1)); + CHECK_THROWS_WITH_AS(json(1).rbegin()[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&); + + CHECK(json(1).crbegin()[0] == json(1)); + CHECK_THROWS_WITH_AS(json(1).crbegin()[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&); } } }