summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-05-19 05:43:40 -0400
committerGitHub <noreply@github.com>2021-05-19 05:43:40 -0400
commitc84fdedda827d5d34e0d53622ed39b56c386df09 (patch)
tree3e53b0a354b05acdd51c7c25119004ec1f65cb67 /vendor
parent959d6a0c40b60a84eead551eaaa7498450017763 (diff)
parentaf748b94ed254249fd61c17a06ed3ece4e3947de (diff)
downloadpodman-c84fdedda827d5d34e0d53622ed39b56c386df09.tar.gz
podman-c84fdedda827d5d34e0d53622ed39b56c386df09.tar.bz2
podman-c84fdedda827d5d34e0d53622ed39b56c386df09.zip
Merge pull request #10398 from containers/dependabot/go_modules/k8s.io/apimachinery-0.21.1
Bump k8s.io/apimachinery from 0.21.0 to 0.21.1
Diffstat (limited to 'vendor')
-rw-r--r--vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go2
-rw-r--r--vendor/modules.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go b/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
index f89ca163c..3e0cdb10d 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
+++ b/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
@@ -166,7 +166,7 @@ func (m *Quantity) Unmarshal(data []byte) error {
if err != nil {
return err
}
- if skippy < 0 {
+ if (skippy < 0) || (iNdEx+skippy) < 0 {
return ErrInvalidLengthGenerated
}
if (iNdEx + skippy) > l {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 2aa2e39fb..b3c90dd5b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -782,7 +782,7 @@ gopkg.in/yaml.v3
# k8s.io/api v0.21.0
k8s.io/api/apps/v1
k8s.io/api/core/v1
-# k8s.io/apimachinery v0.21.0
+# k8s.io/apimachinery v0.21.1
k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/apis/meta/v1
k8s.io/apimachinery/pkg/conversion