Merge pull request #145 from nathanhourt/bts_1898

Resolves issue bitshares/bitshares-core#1898: Fix crash in API
bitshares · Aug 13, 2019 · 17c4639 · 17c4639
2 parents 7b6c359 + 06f8897
commit 17c4639
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/include/fc/rpc/api_connection.hpp b/include/fc/rpc/api_connection.hpp
@@ -44,13 +44,18 @@ namespace fc {
       }
 
       template<typename R, typename Arg0, typename ... Args>
-      R call_generic( const std::function<R(Arg0,Args...)>& f, variants::const_iterator a0, variants::const_iterator e, uint32_t max_depth )
+      R call_generic( const std::function<R(Arg0,Args...)>& f, variants::const_iterator a0,
+                      variants::const_iterator e, uint32_t max_depth )
       {
          bool optional_args = all_optionals<std::decay_t<Arg0>, std::decay_t<Args>...>::value;
          FC_ASSERT( a0 != e || optional_args );
          FC_ASSERT( max_depth > 0, "Recursion depth exceeded!" );
-         auto arg = (a0 == e)? std::decay_t<Arg0>() : a0->as<std::decay_t<Arg0>>(max_depth - 1);
-         return call_generic<R,Args...>( bind_first_arg<R,Arg0,Args...>( f, arg ), a0+1, e, max_depth - 1 );
+         if (a0==e)
+            return call_generic<R,Args...>( bind_first_arg<R,Arg0,Args...>( f, std::decay_t<Arg0>() ), a0,
+                                            e, max_depth - 1 );
+         auto arg = a0->as<std::decay_t<Arg0>>(max_depth - 1);
+         return call_generic<R,Args...>( bind_first_arg<R,Arg0,Args...>( f, std::move(arg) ), a0+1, e,
+                                         max_depth - 1 );
       }
 
       template<typename R, typename ... Args>
@@ -180,13 +185,18 @@ namespace fc {
          }
 
          template<typename R, typename Arg0, typename ... Args>
-         R call_generic( const std::function<R(Arg0,Args...)>& f, variants::const_iterator a0, variants::const_iterator e, uint32_t max_depth )
+         R call_generic( const std::function<R(Arg0,Args...)>& f, variants::const_iterator a0,
+                         variants::const_iterator e, uint32_t max_depth )
          {
             bool optional_args = detail::all_optionals<std::decay_t<Arg0>, std::decay_t<Args>...>::value;
             FC_ASSERT( a0 != e || optional_args, "too few arguments passed to method" );
             FC_ASSERT( max_depth > 0, "Recursion depth exceeded!" );
-            auto arg = (a0 == e)? std::decay_t<Arg0>() : a0->as<std::decay_t<Arg0>>(max_depth - 1);
-            return  call_generic<R,Args...>( this->bind_first_arg<R,Arg0,Args...>( f, arg ), a0+1, e, max_depth - 1 );
+            if (a0==e)
+               return call_generic<R,Args...>( this->bind_first_arg<R,Arg0,Args...>( f, std::decay_t<Arg0>() ), a0,
+                                               e, max_depth - 1 );
+            auto arg = a0->as<std::decay_t<Arg0>>(max_depth - 1);
+            return call_generic<R,Args...>( this->bind_first_arg<R,Arg0,Args...>( f, std::move(arg) ), a0+1, e,
+                                            max_depth - 1 );
          }
 
          struct api_visitor