gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-22 23:26:39 -08:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): bump wazero to latest main (#2436)

Browse Source 
also fixes a redundant close

Signed-off-by: Adrian Cole <adrian@tetrate.io>
This commit is contained in:
Crypt Keeper
2022-07-03 23:52:37 +08:00
committed by GitHub
parent 581fe1ed55
commit f0720f3ce5
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -46,7 +46,7 @@ require (
github.com/sosedoff/gitkit v0.3.0
github.com/stretchr/testify v1.8.0
github.com/testcontainers/testcontainers-go v0.13.0
github.com/tetratelabs/wazero v0.0.0-20220606011721-119b069ba23e
github.com/tetratelabs/wazero v0.0.0-20220701105919-891761ac1ee2
github.com/twitchtv/twirp v8.1.2+incompatible
github.com/urfave/cli/v2 v2.8.1
github.com/xlab/treeprint v1.1.0

4
go.sum
View File

@@ -1380,8 +1380,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG
github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
github.com/testcontainers/testcontainers-go v0.13.0 h1:OUujSlEGsXVo/ykPVZk3KanBNGN0TYb/7oKIPVn15JA=
github.com/testcontainers/testcontainers-go v0.13.0/go.mod h1:z1abufU633Eb/FmSBTzV6ntZAC1eZBYPtaFsn4nPuDk=
github.com/tetratelabs/wazero v0.0.0-20220606011721-119b069ba23e h1:ZamZ43RLjKymhv0ny0uXU1cUL8T/UEXmTQRJLAvJcF4=
github.com/tetratelabs/wazero v0.0.0-20220606011721-119b069ba23e/go.mod h1:Y4X/zO4sC2dJjZG9GDYNRbJGogfqFYJY/BbyKlOxXGI=
github.com/tetratelabs/wazero v0.0.0-20220701105919-891761ac1ee2 h1:mm9H2anFWwJE64jUuvKr6CbJzupcUcec+AScrdgxtbY=
github.com/tetratelabs/wazero v0.0.0-20220701105919-891761ac1ee2/go.mod h1:Y4X/zO4sC2dJjZG9GDYNRbJGogfqFYJY/BbyKlOxXGI=
github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=

17
pkg/module/module.go
View File

@@ -9,7 +9,6 @@ import (
"path/filepath"
"regexp"
"github.com/hashicorp/go-multierror"
"github.com/liamg/memoryfs"
"github.com/mailru/easyjson"
"github.com/samber/lo"
@@ -145,16 +144,7 @@ func (m *Manager) Register() {
}
func (m *Manager) Close(ctx context.Context) error {
var errs error
if err := m.runtime.Close(ctx); err != nil {
errs = multierror.Append(errs, err)
}
for _, p := range m.modules {
if err := p.Close(ctx); err != nil {
errs = multierror.Append(errs, err)
}
}
return errs
return m.runtime.Close(ctx)
}
func splitPtrSize(u uint64) (uint32, uint32) {
@@ -412,10 +402,7 @@ func (m *wasmModule) Analyze(ctx context.Context, input analyzer.AnalysisInput)
}
// Pass memory fs to the analyze() function
ctx, closer, err := experimental.WithFS(ctx, memfs)
if err != nil {
return nil, xerrors.Errorf("fs error: %w", err)
}
ctx, closer := experimental.WithFS(ctx, memfs)
defer closer.Close(ctx)
inputPtr, inputSize, err := stringToPtrSize(ctx, filePath, m.mod, m.malloc)