[move-vm] Fix a bug in order of bounds checking

aptos-labs · Oct 1, 2024 · 42b12b6 · 42b12b6
1 parent 934daf5
commit 42b12b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/third_party/move/move-binary-format/src/check_bounds.rs b/third_party/move/move-binary-format/src/check_bounds.rs
@@ -97,8 +97,6 @@ impl<'a> BoundsChecker<'a> {
         self.check_function_instantiations()?;
         self.check_field_instantiations()?;
         self.check_struct_defs()?;
-        self.check_function_defs()?;
-        // Since bytecode version 7
         self.check_table(
             self.view.variant_field_handles(),
             Self::check_variant_field_handle,
@@ -115,6 +113,7 @@ impl<'a> BoundsChecker<'a> {
             self.view.struct_variant_instantiations(),
             Self::check_struct_variant_instantiation,
         )?;
+        self.check_function_defs()?;
         Ok(())
     }
 

diff --git a/third_party/move/move-bytecode-verifier/src/check_duplication.rs b/third_party/move/move-bytecode-verifier/src/check_duplication.rs
@@ -30,12 +30,7 @@ pub struct DuplicationChecker<'a> {
 
 impl<'a> DuplicationChecker<'a> {
     pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
-        let res = Self::verify_module_impl(module)
-            .map_err(|e| e.finish(Location::Module(module.self_id())));
-        if let Err(e) = res.clone() {
-            println!("error: {}", e)
-        }
-        res
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
     }
 
     fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {