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

Skip empty symbol names while attempting to parse json #204

Merged
merged 2 commits into from Oct 21, 2020
Merged

Skip empty symbol names while attempting to parse json #204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82a79c5
Skip empty symbol names while attempting to parse json
MathiasKoch Oct 21, 2020
13786e9
Add note on why symbols with empty names are skipped
MathiasKoch Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions elf2table/src/lib.rs
View file
Open in desktop
Expand Up @@ -61,9 +61,11 @@ pub fn parse(elf: &[u8]) -> Result<Option<Table>, anyhow::Error> {
// second pass to demangle symbols
let mut map = BTreeMap::new();
for (_, entry) in elf.symbols() {
// Skipping symbols with empty string names, as they may be added by
// `objcopy`, and breaks JSON demangling
let name = match entry.name() {
Some(name) => name,
None => continue,
Some(name) if !name.is_empty() => name,
_ => continue,
};

if entry.section_index() == Some(defmt_shndx) {
Expand Down