PE: Change Section Table Real Name Handling #438
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
prettyroseslover
changed the title
m4b
reviewed
Nov 29, 2024
| @@ -76,7 +76,9 @@ impl SectionTable { | |||
| table.characteristics = bytes.gread_with(offset, scroll::LE)?; | |||
|
|
|||
| if let Some(idx) = table.name_offset()? { | |||
| table.real_name = Some(bytes.pread::<&str>(string_table_offset + idx)?.to_string()); | |||
| if let Ok(real_name) = bytes.pread::<&str>(string_table_offset + idx) { | |||
| table.real_name = Some(real_name.to_string()); | |||
There was a problem hiding this comment.
i think it would be more idiomatic to do:
table.real_name = bytes.pread::<&str>(string_table_offset + idx).ok().map(String::to_owned);the real question is whether:
- It should be considered a fatal error if the name is not utf8
- we should log on error, in which case keeping the
if let Okis better
There was a problem hiding this comment.
Sorry it took me so long to reply!
As far as I understand, real_name is stored in COFF String Table, but there is nothing stated about the encoding. However? for Symbol Name the following is stated:
By convention, the names are treated as zero-terminated UTF-8 encoded strings.
Maybe, it can be applied to real_name, too?
However, I do not consider it to be a fatal error, so maybe we should stick to if let Ok?
There was a problem hiding this comment.
yes i think it's ok; the idiomatic suggestion above i wrote is a if let Ok that (ok() maps Result to Option, and then map returns the owned portion if it is some); my only question was whether we should log it or not. if we log it then putting it in a let ok is better. i'll leave it up to you which to do, e.g.:
- do the single line ok map
- do if let with logging on failure side.
m4b
requested changes
Jan 5, 2025
| @@ -76,7 +76,9 @@ impl SectionTable { | |||
| table.characteristics = bytes.gread_with(offset, scroll::LE)?; | |||
|
|
|||
| if let Some(idx) = table.name_offset()? { | |||
| table.real_name = Some(bytes.pread::<&str>(string_table_offset + idx)?.to_string()); | |||
| if let Ok(real_name) = bytes.pread::<&str>(string_table_offset + idx) { | |||
| table.real_name = Some(real_name.to_string()); | |||
There was a problem hiding this comment.
yes i think it's ok; the idiomatic suggestion above i wrote is a if let Ok that (ok() maps Result to Option, and then map returns the owned portion if it is some); my only question was whether we should log it or not. if we log it then putting it in a let ok is better. i'll leave it up to you which to do, e.g.:
- do the single line ok map
- do if let with logging on failure side.
|
Excuse me for interrupting. I encountered the similar thing before and this is the minimum reproducible test case I wrote that time. Perhaps adding some kind of tests for such would be awesome and hope it helps!
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While trying to parse a particular PE file, I stumbled across an
"invalid utf8"error coming from Section Table Real Name. However hard I tried I couldn't find the problem with the file itself. But this simple change in the source code ofparse()function finally worked.