Fix array access checks, more tests

Author: d-frey

include/tao/json/value.hh

@@ -418,13 +418,13 @@ namespace tao
             const basic_value * v = this;
             const char * p = k.value().c_str();
             const char * e = p + k.value().size();
-            while( p != e ) {
-               switch( v->m_type ) {
+            while ( p != e ) {
+               switch ( v->m_type ) {
                   case json::type::ARRAY:
                      {
                         const auto t = internal::next_json_pointer_token( ++p, e );
-                        if( t == "-" ) {
-                           throw std::out_of_range( "unable to resolve json_pointer" );
+                        if ( ( t.find_first_not_of( "0123456789" ) != std::string::npos ) || ( t.size() > 1 && t[ 0 ] == '0' ) ) {
+                           throw std::out_of_range( "unable to resolve json_pointer, invalid token for const array access '" + t + '\'' );
                         }
                         v = &v->at( std::stoull( t ) );
                      }

src/test/json/json_pointer.cc

@@ -26,7 +26,7 @@ namespace tao
          // create test vector
          const std::string ezp( "o\0p", 3 );
          const std::string ezq( "o\0q", 3 );
-         const value v {
+         const value cv {
             { "foo", value::array( { "bar", "baz" } ) },
             { "", 0 },
             { "a/b", 1 },
@@ -38,31 +38,46 @@ namespace tao
             { " ", 7 },
             { "m~n", 8 },
             { ezp, 9 },
-            { ezq, 10 }
+            { ezq, 10 },
+            { "-", 11 }
          };
 
          // check access
-         TEST_ASSERT( v.at( ""_json_pointer ) == v );
-         TEST_ASSERT( v.at( "/foo"_json_pointer ) == value::array( { "bar", "baz" } ) );
-         TEST_ASSERT( v.at( "/foo/0"_json_pointer ) == "bar" );
-         TEST_ASSERT( v.at( "/"_json_pointer ) == 0 );
-         TEST_ASSERT( v.at( "/a~1b"_json_pointer ) == 1 );
-         TEST_ASSERT( v.at( "/c%d"_json_pointer ) == 2 );
-         TEST_ASSERT( v.at( "/e^f"_json_pointer ) == 3 );
-         TEST_ASSERT( v.at( "/g|h"_json_pointer ) == 4 );
-         TEST_ASSERT( v.at( "/i\\j"_json_pointer ) == 5 );
-         TEST_ASSERT( v.at( "/k\"l"_json_pointer ) == 6 );
-         TEST_ASSERT( v.at( "/ "_json_pointer ) == 7 );
-         TEST_ASSERT( v.at( "/m~0n"_json_pointer ) == 8 );
-         TEST_ASSERT( v.at( "/o\0p"_json_pointer ) == 9 );
-         TEST_ASSERT( v.at( "/o\0q"_json_pointer ) == 10 );
-
-         TEST_THROWS( v.at( "/o\0r"_json_pointer ) );
-
-         TEST_THROWS( v.at( "/bar"_json_pointer ) );
-         TEST_THROWS( v.at( "/foo/bar"_json_pointer ) );
-         TEST_THROWS( v.at( "//"_json_pointer ) );
-         TEST_THROWS( v.at( "/-"_json_pointer ) );
+         TEST_ASSERT( cv.at( ""_json_pointer ) == cv );
+
+         TEST_ASSERT( cv.at( "/foo"_json_pointer ) == value::array( { "bar", "baz" } ) );
+         TEST_THROWS( cv.at( "/bar"_json_pointer ) );
+
+         TEST_ASSERT( cv.at( "/foo/0"_json_pointer ) == "bar" );
+         TEST_ASSERT( cv.at( "/foo/1"_json_pointer ) == "baz" );
+         TEST_THROWS( cv.at( "/foo/2"_json_pointer ) );
+
+         TEST_THROWS( cv.at( "/foo/00"_json_pointer ) );
+         TEST_THROWS( cv.at( "/foo/01"_json_pointer ) );
+         TEST_THROWS( cv.at( "/foo/0 "_json_pointer ) );
+         TEST_THROWS( cv.at( "/foo/ 0"_json_pointer ) );
+         TEST_THROWS( cv.at( "/foo/1 "_json_pointer ) );
+         TEST_THROWS( cv.at( "/foo/ 1"_json_pointer ) );
+         TEST_THROWS( cv.at( "/foo/-"_json_pointer ) );
+         TEST_THROWS( cv.at( "/foo/bar"_json_pointer ) );
+
+         TEST_ASSERT( cv.at( "/"_json_pointer ) == 0 );
+         TEST_THROWS( cv.at( "//"_json_pointer ) );
+
+         TEST_ASSERT( cv.at( "/a~1b"_json_pointer ) == 1 );
+         TEST_ASSERT( cv.at( "/c%d"_json_pointer ) == 2 );
+         TEST_ASSERT( cv.at( "/e^f"_json_pointer ) == 3 );
+         TEST_ASSERT( cv.at( "/g|h"_json_pointer ) == 4 );
+         TEST_ASSERT( cv.at( "/i\\j"_json_pointer ) == 5 );
+         TEST_ASSERT( cv.at( "/k\"l"_json_pointer ) == 6 );
+         TEST_ASSERT( cv.at( "/ "_json_pointer ) == 7 );
+         TEST_ASSERT( cv.at( "/m~0n"_json_pointer ) == 8 );
+
+         TEST_ASSERT( cv.at( "/o\0p"_json_pointer ) == 9 );
+         TEST_ASSERT( cv.at( "/o\0q"_json_pointer ) == 10 );
+         TEST_THROWS( cv.at( "/o\0r"_json_pointer ) );
+
+         TEST_ASSERT( cv.at( "/-"_json_pointer ) == 11 );
       }
 
    } // json