test[fuzz]: fix issue where section data offset > end #4
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
| @@ -144,6 +144,9 @@ type ResourceDataEntry struct { | |||
| } | |||
|
|
|||
| // makeIntResource mimics the MAKEINTRESOURCE macro. | |||
| // go-vet : tagged as misues of unsafe.Pointer ( | |||
| // go test -gcflags=all=-d=checkptr | |||
| // fatal error: checkptr: pointer arithmetic computed bad pointer value) | |||
| if (pe.Is32 && oh32.SizeOfImage%oh32.SectionAlignment != 0) || | ||
| (pe.Is64 && oh64.SizeOfImage%oh64.SectionAlignment != 0) { | ||
| pe.Anomalies = append(pe.Anomalies, AnoInvalidSizeOfImage) | ||
| // Check that SectionAlignment is not 0 |
| @@ -349,6 +349,12 @@ type DataDirectory struct { | |||
| // beginning of the file. | |||
| func (pe *File) ParseNTHeader() (err error) { | |||
| ntHeaderOffset := pe.DosHeader.AddressOfNewEXEHeader | |||
| // LittleEndian.Uint32 will panic if input doesn't have enough bytes (index out of range) | |||
| // in the case where pe.data[ntHeaderOffset:] is less than 4 bytes | |||
| signatureBytes := pe.data[ntHeaderOffset:] | |||
There was a problem hiding this comment.
I forgot this one, we have a helper function that should be used here:
// ReadUint32 read a uint32 from a buffer.
func (pe *File) ReadUint32(offset uint32) (uint32, error) {
if offset+4 > pe.size {
return 0, ErrOutsideBoundary
}
return binary.LittleEndian.Uint32(pe.data[offset:]), nil
}
// Something like this:
signature, err := pe.ReadUint32(ntHeaderOffset)
if err != nil {
return ErrInvalidNTHeaderOffset
}
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.
This PR fixes issues triggered by fuzzing (incomplete)