New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Variant fix #21

Merged

abitmore merged 6 commits into bitshares:master from pmconrad:variant_fix

Mar 19, 2018

pmconrad commented Mar 13, 2018 •

edited

Loading

~~Work in progress~~
Limit recursion in variant conversions

pmconrad added 5 commits

March 13, 2018 22:00


          Added max_depth parameter to variant conversions

81c8d89


          Added missing depth check

dd9197c


          Adapted API conversions, incomplete

271a837


          Moved LOG_*_DEPTH variable to new config.hpp

2f5f599


          Added max_depth to remaining variant conversions

a918226

pmconrad mentioned this pull request

JSON fix bitshares/bitshares-core#714

Merged

abitmore self-assigned this

abitmore requested changes

View reviewed changes

include/fc/io/raw.hpp Outdated

@@ @@ -57,15 +57,17 @@ namespace fc { @@
                   inline void pack( Stream& s, const fc::log_message& msg, uint32_t _max_depth )
                   {
                      FC_ASSERT( _max_depth > 0 );
-                     fc::raw::pack( s, variant(msg), _max_depth - 1 ); // TODO check variant depth?
+                     --_max_depth;
+                     fc::raw::pack( s, variant( msg, _max_depth ), _max_depth );

Member

abitmore Mar 18, 2018

Here we have different definitions on depth. I suggest we change the variant to:
variant( msg, min( _max_depth, FC_MAX_LOG_OBJECT_DEPTH ) ).

include/fc/io/raw.hpp Outdated

-                     msg = vmsg.as<log_message>(); // TODO check depth?
+                     --_max_depth;
+                     fc::raw::unpack( s, vmsg, _max_depth );
+                     msg = vmsg.as<log_message>( _max_depth );

Member

abitmore Mar 18, 2018

Same as above.

include/fc/reflect/variant.hpp Outdated

-                   {
+                 template<typename IsEnum=fc::false_type>
+                 struct if_enum
+                    {

Member

abitmore Mar 18, 2018

Fix indentation.

include/fc/rpc/api_connection.hpp Outdated

                     {
                        FC_ASSERT( a0 != e );
-                       return  call_generic<R,Args...>( bind_first_arg<R,Arg0,Args...>( f, a0->as< typename std::decay<Arg0>::type >() ), a0+1, e );
+                       return  call_generic<R,Args...>( bind_first_arg<R,Arg0,Args...>( f, a0->as< typename std::decay<Arg0>::type >( max_depth - 1 ) ), a0+1, e, max_depth - 1 );

Member

abitmore Mar 18, 2018

Check max_depth > 0?

include/fc/rpc/api_connection.hpp Outdated

    
                       return [=]( const variants& args ) { 

                          return variant( call_generic( f, args.begin(), args.end() ) ); 

                       return [=]( const variants& args, uint32_t max_depth ) {

                          return variant( call_generic( f, args.begin(), args.end(), max_depth - 1 ), max_depth - 1 );

Member

abitmore Mar 18, 2018

Check max_depth > 0?

include/fc/rpc/api_connection.hpp Outdated

    
                       return [=]( const variants& args ) { 

                          call_generic( f, args.begin(), args.end() ); 

                       return [=]( const variants& args, uint32_t max_depth ) {

                          call_generic( f, args.begin(), args.end(), max_depth - 1 );

Member

abitmore Mar 18, 2018

Check max_depth > 0?

include/fc/rpc/api_connection.hpp Outdated

    
                          detail::callback_functor<Signature> arg0( get_connection(), a0->as<uint64_t>() );

                          return  call_generic<R,Args...>( this->bind_first_arg<R,std::function<Signature>,Args...>( f, std::function<Signature>(arg0) ), a0+1, e );

                          detail::callback_functor<Signature> arg0( get_connection(), a0->as<uint64_t>(1) );

                          return call_generic<R,Args...>( this->bind_first_arg<R,std::function<Signature>,Args...>( f, std::function<Signature>(arg0) ), a0+1, e, max_depth - 1 );

Member

abitmore Mar 18, 2018

Check max_depth > 0?

include/fc/rpc/api_connection.hpp Outdated

    
                          detail::callback_functor<Signature> arg0( get_connection(), a0->as<uint64_t>() );

                          return  call_generic<R,Args...>( this->bind_first_arg<R,const std::function<Signature>&,Args...>( f, arg0 ), a0+1, e );

                          detail::callback_functor<Signature> arg0( get_connection(), a0->as<uint64_t>(1) );

                          return call_generic<R,Args...>( this->bind_first_arg<R,const std::function<Signature>&,Args...>( f, arg0 ), a0+1, e, max_depth - 1 );

Member

abitmore Mar 18, 2018

Check max_depth > 0?

include/fc/rpc/api_connection.hpp Outdated

                        {
                           FC_ASSERT( a0 != e, "too few arguments passed to method" );
-                          return  call_generic<R,Args...>( this->bind_first_arg<R,Arg0,Args...>( f, a0->as< typename std::decay<Arg0>::type >() ), a0+1, e );
+                          return  call_generic<R,Args...>( this->bind_first_arg<R,Arg0,Args...>( f, a0->as< typename std::decay<Arg0>::type >( max_depth - 1 ) ), a0+1, e, max_depth - 1 );

Member

abitmore Mar 18, 2018

Check max_depth > 0?

abitmore assigned pmconrad and unassigned abitmore


          Added some missing checks, fixed indentation, handle different meanin…

1eb7b9d

…gs of max_depth

pmconrad assigned abitmore and unassigned pmconrad

abitmore approved these changes

View reviewed changes

abitmore merged commit 2bb93c8 into bitshares:master

abitmore referenced this pull request in EOSIO/eos


          don't fall into forever loop in zero byty in json #3500

a5f1a20

abitmore mentioned this pull request

Parsing nesting objects in JSON results in segment fault EOSIO/eos#3539

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet