Patch for #1779 - call_indirect failure

EOSIO · Mar 23, 2018 · f39cba9 · f39cba9
1 parent d6a727e
commit f39cba9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp b/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
@@ -91,7 +91,11 @@ namespace eosio { namespace chain { namespace wasm_injections {
       static void inject( IR::Module& m );
       static void initializer();
    };
-
+
+   struct table_element_fixup_visitor {
+      static void inject( IR::Module& m );
+      static void initializer();
+   };
 
    struct memories_injection_visitor {
       static void inject( IR::Module& m );
@@ -803,6 +807,7 @@ namespace eosio { namespace chain { namespace wasm_injections {
                }
                fd.code = post_code;
             }
+            table_element_fixup_visitor::inject(*_module);
          }
       private:
          IR::Module* _module;

diff --git a/libraries/chain/wasm_eosio_injection.cpp b/libraries/chain/wasm_eosio_injection.cpp
@@ -19,6 +19,15 @@ uint32_t                                  injector_utils::first_imported_index;
 void noop_injection_visitor::inject( Module& m ) { /* just pass */ }
 void noop_injection_visitor::initializer() { /* just pass */ }
 
+void table_element_fixup_visitor::inject( Module& m ) {
+   for(TableSegment& ts : m.tableSegments) {
+      for(auto& idx : ts.indices)
+         idx += injector_utils::registered_injected.size();
+   }
+}
+void table_element_fixup_visitor::initializer() { /* just pass */ }
+
+
 void memories_injection_visitor::inject( Module& m ) {
 }
 void memories_injection_visitor::initializer() {