diff --git a/res/cases/v1/start_add.wasm b/res/cases/v1/start_add.wasm new file mode 100644 index 0000000..8e14a06 Binary files /dev/null and b/res/cases/v1/start_add.wasm differ diff --git a/res/cases/v1/start_add_custom.wasm b/res/cases/v1/start_add_custom.wasm new file mode 100644 index 0000000..90a719d Binary files /dev/null and b/res/cases/v1/start_add_custom.wasm differ diff --git a/src/elements/module.rs b/src/elements/module.rs index 3e4cc0c..3256d1b 100644 --- a/src/elements/module.rs +++ b/src/elements/module.rs @@ -244,14 +244,18 @@ impl Module { } /// Changes the module's start section. - pub fn set_start_section(&mut self, new_start : u32) { - for section in self.sections_mut() { + pub fn set_start_section(&mut self, new_start: u32) { + for section in self.sections_mut().iter_mut() { if let &mut Section::Start(_sect) = section { *section = Section::Start(new_start); return } } - self.sections_mut().push(Section::Start(new_start)); + let insert_before = self.sections().iter().enumerate() + .filter_map(|(i, s)| if s.id() > 0x8 { Some(i) } else { None }) + .next() + .unwrap_or(0); + self.sections_mut().insert(insert_before, Section::Start(new_start)); } /// Removes the module's start section. @@ -755,4 +759,30 @@ mod integration_tests { module.clear_start_section(); assert_eq!(None, module.start_section()); } + + #[test] + fn add_start() { + let mut module = deserialize_file("./res/cases/v1/start_add.wasm").expect("failed to deserialize"); + assert!(module.start_section().is_none()); + module.set_start_section(0); + assert_eq!(module.start_section().expect("Did not find any start section"), 0); + + let sections = module.sections().iter().map(|s| s.id()).collect::>(); + assert_eq!(sections, vec![1, 2, 3, 6, 7, 8, 9, 10, 11]); + } + + #[test] + fn add_start_custom() { + let mut module = deserialize_file("./res/cases/v1/start_add_custom.wasm").expect("failed to deserialize"); + + let sections = module.sections().iter().map(|s| s.id()).collect::>(); + assert_eq!(sections, vec![1, 2, 3, 6, 7, 9, 10, 11, 0]); + + assert!(module.start_section().is_none()); + module.set_start_section(0); + assert_eq!(module.start_section().expect("Did not find any start section"), 0); + + let sections = module.sections().iter().map(|s| s.id()).collect::>(); + assert_eq!(sections, vec![1, 2, 3, 6, 7, 8, 9, 10, 11, 0]); + } }