Skip to content

Commit

Permalink
dont upgrade GoReSym
Browse files Browse the repository at this point in the history
  • Loading branch information
mozillazg committed Nov 1, 2024
1 parent 30ff685 commit 3decab3
Show file tree
Hide file tree
Showing 12 changed files with 510 additions and 536 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/containerd/containerd/api v1.7.19
github.com/containerd/errdefs v0.1.0
github.com/go-logr/logr v1.4.2
github.com/mandiant/GoReSym v1.7.2-0.20241019185929-45d5c9d6063f
github.com/mandiant/GoReSym v1.7.2-0.20240819162932-534ca84b42d5
github.com/smira/go-xz v0.1.0
github.com/stretchr/testify v1.9.0
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/mandiant/GoReSym v1.7.2-0.20241019185929-45d5c9d6063f h1:h0uhdT3Qs503Jnx2AGEZFTlbtJQuDu452OKpiwAZeKg=
github.com/mandiant/GoReSym v1.7.2-0.20241019185929-45d5c9d6063f/go.mod h1:C9Cyl7dQTqNzm5KyrZ78bS54bzwMd1fu3cWDWULCzLc=
github.com/mandiant/GoReSym v1.7.2-0.20240819162932-534ca84b42d5 h1:OyxMVWG+V2gzLNCXfLGyze3zN9Zbi2CKtAlCWtS0L64=
github.com/mandiant/GoReSym v1.7.2-0.20240819162932-534ca84b42d5/go.mod h1:C9Cyl7dQTqNzm5KyrZ78bS54bzwMd1fu3cWDWULCzLc=
github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
Expand Down
6 changes: 3 additions & 3 deletions internal/gosym/pclntab.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ restartParseWithRealTextBase:
}

var moduleData *objfile.ModuleData = nil
var finalTab *objfile.PclntabCandidate
for tab := range tabs {
var finalTab *objfile.PclntabCandidate = &tabs[0]
for _, tab := range tabs {
metadata.TabMeta.VA = tab.PclntabVA
metadata.TabMeta.Version = tab.ParsedPclntab.Go12line.Version.String()
metadata.TabMeta.Endianess = tab.ParsedPclntab.Go12line.Binary.String()
Expand Down Expand Up @@ -81,7 +81,7 @@ restartParseWithRealTextBase:
}

// to be sure we got the right pclntab we had to have found a moduledat as well. If we didn't, then we failed to find the pclntab (correctly) as well
if moduleData == nil || finalTab == nil {
if moduleData == nil {
return nil, fmt.Errorf("no valid pclntab or moduledata found")
}

Expand Down
7 changes: 2 additions & 5 deletions vendor/github.com/mandiant/GoReSym/objfile/disasm.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

286 changes: 143 additions & 143 deletions vendor/github.com/mandiant/GoReSym/objfile/elf.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3decab3

Please sign in to comment.