Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quickfix: Ignore errors when loading name subsection. (#403) #408

Merged
merged 3 commits into from
Dec 15, 2021
Merged

Quickfix: Ignore errors when loading name subsection. (#403) #408

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00506d7
Quickfix: Ignore errors when loading name subsection. (#403)
Dec 14, 2021
c2b4016
Minor refactoring after code review; code formatting.
Dec 14, 2021
cacdae5
Fix typo.
Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions src/read/wasm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,25 +254,34 @@ impl<'data, R: ReadRef<'data>> WasmFile<'data, R> {
.get_name_section_reader()
.read_error("Couldn't read header of the name section")?
{
let name =
match name.read_error("Couldn't read header of a name subsection")? {
// TODO: Right now, ill-formed name subsections
// are silently ignored in order to maintain
// compatibility with extended name sections, which
// are not yet supported by the version of
// `wasmparser` currently used.
// A better fix would be to update `wasmparser` to
// the newester version, but this requires
// a major rewrite of this file.
if let Ok(name) = name {
let name = match name {
wp::Name::Function(name) => name,
lwagner94 marked this conversation as resolved.
Show resolved Hide resolved
_ => continue,
};
let mut name_map = name
.get_map()
.read_error("Couldn't read header of the function name subsection")?;
for _ in 0..name_map.get_count() {
let naming = name_map
.read()
.read_error("Couldn't read a function name")?;
if let Some(local_index) =
naming.index.checked_sub(imported_funcs_count)
{
if let LocalFunctionKind::Local { symbol_id } =
local_func_kinds[local_index as usize]
let mut name_map = name
.get_map()
.read_error("Couldn't read header of the function name subsection")?;
for _ in 0..name_map.get_count() {
let naming = name_map
.read()
.read_error("Couldn't read a function name")?;
if let Some(local_index) =
naming.index.checked_sub(imported_funcs_count)
{
file.symbols[symbol_id as usize].name = naming.name;
if let LocalFunctionKind::Local { symbol_id } =
local_func_kinds[local_index as usize]
{
file.symbols[symbol_id as usize].name = naming.name;
}
}
}
}
Expand Down