diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-28 16:27:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 16:27:42 +0200 |
| commit | feb7bffbc9d849326cd95f36ffa45a3c0e2e7047 (patch) | |
| tree | 5887fef9b91db67ed0c87d3fa88c336122406168 /vendor | |
| parent | 5aa033d33f8bab1c4da9671acacc3c694160ca86 (diff) | |
| parent | 379bf1080e86c6296a653b7270dc56b79280544d (diff) | |
| download | podman-feb7bffbc9d849326cd95f36ffa45a3c0e2e7047.tar.gz podman-feb7bffbc9d849326cd95f36ffa45a3c0e2e7047.tar.bz2 podman-feb7bffbc9d849326cd95f36ffa45a3c0e2e7047.zip | |
Merge pull request #15101 from containers/dependabot/go_modules/github.com/containernetworking/cni-1.1.2
Bump github.com/containernetworking/cni from 1.1.1 to 1.1.2
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containernetworking/cni/pkg/invoke/exec.go | 6 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/exec.go b/vendor/github.com/containernetworking/cni/pkg/invoke/exec.go index 55ed392a0..3ad07aa8f 100644 --- a/vendor/github.com/containernetworking/cni/pkg/invoke/exec.go +++ b/vendor/github.com/containernetworking/cni/pkg/invoke/exec.go @@ -50,6 +50,12 @@ func fixupResultVersion(netconf, result []byte) (string, []byte, error) { return "", nil, fmt.Errorf("failed to unmarshal raw result: %w", err) } + // plugin output of "null" is successfully unmarshalled, but results in a nil + // map which causes a panic when the confVersion is assigned below. + if rawResult == nil { + rawResult = make(map[string]interface{}) + } + // Manually decode Result version; we need to know whether its cniVersion // is empty, while built-in decoders (correctly) substitute 0.1.0 for an // empty version per the CNI spec. diff --git a/vendor/modules.txt b/vendor/modules.txt index d7edfabe7..7bbdaa6b5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -76,7 +76,7 @@ github.com/containerd/containerd/sys # github.com/containerd/stargz-snapshotter/estargz v0.12.0 github.com/containerd/stargz-snapshotter/estargz github.com/containerd/stargz-snapshotter/estargz/errorutil -# github.com/containernetworking/cni v1.1.1 +# github.com/containernetworking/cni v1.1.2 ## explicit github.com/containernetworking/cni/libcni github.com/containernetworking/cni/pkg/invoke |