fix parse_into handling of tuple of the wrong size

boostorg · Oct 7, 2024 · 27c40ee · 27c40ee
1 parent b036074
commit 27c40ee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/include/boost/json/detail/parse_into.hpp b/include/boost/json/detail/parse_into.hpp
@@ -829,7 +829,7 @@ class converting_handler<tuple_conversion_tag, T, P>
         if( inner_active_ < N )
         {
             BOOST_JSON_FAIL( ec, error::size_mismatch );
-            return true;
+            return false;
         }
 
         inner_active_ = -1;

diff --git a/test/parse_into.cpp b/test/parse_into.cpp
@@ -157,9 +157,17 @@ class parse_into_test
 # pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
         system::error_code ec;
-        T t{};
+        T t1{};
         std::string json = serialize(sample);
-        parser_for<T> p( parse_options{}, &t );
+
+        parse_into<T>(t1, json, ec);
+        BOOST_TEST( ec.failed() );
+        BOOST_TEST( ec.has_location() );
+        BOOST_TEST( ec == e );
+
+        T t2{};
+        ec = {};
+        parser_for<T> p( parse_options{}, &t2 );
         for( auto& c: json )
         {
             std::size_t const n = p.write_some( true, &c, 1, ec );
@@ -355,6 +363,8 @@ class parse_into_test
             error::size_mismatch, {1, 2} );
         testParseIntoErrors< std::tuple<std::vector<int>>  >(
             error::size_mismatch, {{1,2}, {3,4}} );
+        testParseIntoErrors<std::map<std::string, std::tuple<int, int>>>(
+            error::size_mismatch, { {"tup", array()} });
     }
 
     void testStruct()