pkg/proc: pad variable mem in extractVarInfoFromEntry #3365
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
On 64 bit system, the byte size of the following struct is 16:
type myStruct struct {
a int
b uint32
}
But extractVarInfoFromEntry only allocates a mem of 12 bytes for it.
When calling method of this struct with the "call" command, it will
result in this error:
write out of bounds
This patch extends the mem by adding padding bytes to the end of the
mem.
Fixes go-delve#3364.
aarzilli
reviewed
May 12, 2023
pkg/proc/variables.go
Outdated
| @@ -1207,6 +1207,11 @@ func extractVarInfoFromEntry(tgt *Target, bi *BinaryInfo, image *Image, regs op. | |||
| } | |||
| } | |||
| if cmem != nil { | |||
| paddingBytes := int(t.Common().ByteSize) - len(cmem.data) | |||
There was a problem hiding this comment.
I think this should be moved inside newCompositeMemory in pkg/proc/mem.go (add an extra size int parameter to it).
There was a problem hiding this comment.
Thank you Alessandro! I have moved the padding logic to newCompositeMemory. Since the type of CommonType.ByteSize is int64, I add the extra parameter as size int64. Please take another look.
|
LGTM, thank you! |
aarzilli
approved these changes
May 13, 2023
|
Thank you! Should I do a force push to squash the two commits into one? |
|
No need. |
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.
On 64 bit system, the byte size of the following struct is 16:
But
extractVarInfoFromEntryonly allocates a mem of 12 bytes for it. When calling method of this struct with thecallcommand, it will result in this error:This patch extends the mem by adding padding bytes to the end of the mem.
Fixes #3364.