fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-05 11:01:38 +00:00
Code Issues Projects Releases Wiki Activity

Fix section ordering when adding a Start section

Browse Source 
Fixes #259
This commit is contained in:
Joshua Warner 2018-12-28 17:31:09 -08:00
parent 239661dc24
commit 8770cafbb6
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/cases/v1/start_add.wasm Normal file
View File

Binary file not shown.

24
src/elements/module.rs
View File

@ -245,13 +245,17 @@ impl Module {
/// Changes the module's start section. /// Changes the module's start section.
pub fn set_start_section(&mut self, new_start : u32) { pub fn set_start_section(&mut self, new_start : u32) {
for section in self.sections_mut() { let mut insert_after = 0;
for (i, section) in self.sections_mut().iter_mut().enumerate() {
if let &mut Section::Start(_sect) = section { if let &mut Section::Start(_sect) = section {
*section = Section::Start(new_start); *section = Section::Start(new_start);
return return
} }
if section.id() < 0x8 {
insert_after = i;
} }
self.sections_mut().push(Section::Start(new_start)); }
self.sections_mut().insert(insert_after + 1, Section::Start(new_start));
} }
/// Removes the module's start section. /// Removes the module's start section.
@ -755,4 +759,20 @@ mod integration_tests {
module.clear_start_section(); module.clear_start_section();
assert_eq!(None, module.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::<Vec<_>>();
let sorted_sections = {
let mut s = sections.clone();
s.sort();
s
};
assert_eq!(sections, sorted_sections, "Sections must be correctly sorted by id");
}
} }