aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2022-07-28 12:11:40 +0000
committerGitHub <noreply@github.com>2022-07-28 12:11:40 +0000
commit379bf1080e86c6296a653b7270dc56b79280544d (patch)
treed7ab351b4234d4e01191fa6ab004cacabe1fa91f /vendor/github.com
parentef6f5a9ea842098db8b6e83be070ce3ae0ec85a7 (diff)
downloadpodman-379bf1080e86c6296a653b7270dc56b79280544d.tar.gz
podman-379bf1080e86c6296a653b7270dc56b79280544d.tar.bz2
podman-379bf1080e86c6296a653b7270dc56b79280544d.zip
Bump github.com/containernetworking/cni from 1.1.1 to 1.1.2
Bumps [github.com/containernetworking/cni](https://github.com/containernetworking/cni) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/containernetworking/cni/releases) - [Commits](https://github.com/containernetworking/cni/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: github.com/containernetworking/cni dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/containernetworking/cni/pkg/invoke/exec.go6
1 files changed, 6 insertions, 0 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.