CVE-2021-3121: Improper Validation of Array Index (CWE-129)
value: An issue was discovered in GoGo Protobuf before 1.3.2. plugin/unmarshal/unmarshal.go lacks certain index validation, aka the "skippy peanut butter" issue.
CWE description: The product uses untrusted input when calculating or using an array index, but the product does not validate or incorrectly validates the index to ensure the index references a valid position within the array.
CVSS v3 base score: 8.6
Published: 2021-01-11T06:15Z
Repository: https://github.com/gogo/protobuf
Language: Go
Files changed: plugin/unmarshal/unmarshal.go, test/asymetric-issue125/asym.pb.go, test/casttype/combos/both/casttype.pb.go, test/casttype/combos/unmarshaler/casttype.pb.go, test/castvalue/combos/both/castvalue.pb.go, test/castvalue/combos/unmarshaler/castvalue.pb.go, test/combos/both/thetest.pb.go, test/combos/unmarshaler/thetest.pb.go, test/custombytesnonstruct/proto.pb.go, test/data/data.pb.go, test/empty-issue70/empty.pb.go, test/enumdecl/enumdecl.pb.go, test/enumdecl_all/enumdeclall.pb.go, test/example/example.pb.go, test/fuzztests/fuzz.pb.go, test/importcustom-issue389/imported/a.pb.go, test/importcustom-issue389/importing/c.pb.go, test/indeximport-issue72/index/index.pb.go, test/indeximport-issue72/indeximport.pb.go, test/int64support/object.pb.go, test/issue260/issue260.pb.go, test/issue261/issue261.pb.go, test/issue262/timefail.pb.go, test/issue322/issue322.pb.go, test/issue330/issue330.pb.go, test/issue34/proto.pb.go, test/issue42order/issue42.pb.go, test/issue449/issue449.pb.go, test/issue498/issue498.pb.go, test/issue503/issue503.pb.go, test/issue530/issue530.pb.go, test/issue617/issue617.pb.go, test/issue8/proto.pb.go, test/mapdefaults/combos/both/map.pb.go, test/mapdefaults/combos/unmarshaler/map.pb.go, test/mapsproto2/combos/both/mapsproto2.pb.go, test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go, test/nopackage/nopackage.pb.go, test/oneof/combos/both/one.pb.go, test/oneof/combos/unmarshaler/one.pb.go, test/oneof3/combos/both/one.pb.go, test/oneof3/combos/unmarshaler/one.pb.go, test/packed/packed.pb.go, test/protosize/protosize.pb.go, test/required/requiredexample.pb.go, test/sizeunderscore/sizeunderscore.pb.go, test/theproto3/combos/both/theproto3.pb.go, test/theproto3/combos/unmarshaler/theproto3.pb.go, test/typedecl/typedecl.pb.go, test/typedecl_all/typedeclall.pb.go, test/types/combos/both/types.pb.go, test/types/combos/unmarshaler/types.pb.go, test/unmarshalmerge/unmarshalmerge.pb.go, test/unrecognized/unrecognized.pb.go, test/unrecognizedgroup/unrecognizedgroup.pb.go, types/any.pb.go, types/api.pb.go, types/duration.pb.go, types/empty.pb.go, types/field_mask.pb.go, types/source_context.pb.go, types/struct.pb.go, types/timestamp.pb.go, types/type.pb.go, types/wrappers.pb.go, vanity/test/fast/gogovanity.pb.go, vanity/test/fast/proto3.pb.go, vanity/test/fast/vanity.pb.go, vanity/test/faster/gogovanity.pb.go, vanity/test/faster/proto3.pb.go, vanity/test/faster/vanity.pb.go, vanity/test/slick/gogovanity.pb.go, vanity/test/slick/proto3.pb.go, vanity/test/slick/vanity.pb.go
Commit date: 2021-01-10 08:01:47 +0000
Commit message: skippy peanut butter

Diff: diff --git a/plugin/unmarshal/unmarshal.go b/plugin/unmarshal/unmarshal.go
index 9a2374b5..fae67de4 100644
--- a/plugin/unmarshal/unmarshal.go
+++ b/plugin/unmarshal/unmarshal.go
@@ -842,11 +842,11 @@ func (p *unmarshal) field(file *generator.FileDescriptor, msg *generator.Descrip
 			p.P(`if err != nil {`)
 			p.In()
 			p.P(`return err`)
 			p.Out()
 			p.P(`}`)
-			p.P(`if skippy < 0 {`)
+			p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`)
 			p.In()
 			p.P(`return ErrInvalidLength`, p.localName)
 			p.Out()
 			p.P(`}`)
 			p.P(`if (iNdEx + skippy) > postIndex {`)
@@ -1482,16 +1482,11 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) {
 			p.P(`if err != nil {`)
 			p.In()
 			p.P(`return err`)
 			p.Out()
 			p.P(`}`)
-			p.P(`if skippy < 0 {`)
-			p.In()
-			p.P(`return ErrInvalidLength`, p.localName)
-			p.Out()
-			p.P(`}`)
-			p.P(`if (iNdEx + skippy) < 0 {`)
+			p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`)
 			p.In()
 			p.P(`return ErrInvalidLength`, p.localName)
 			p.Out()
 			p.P(`}`)
 			p.P(`if (iNdEx + skippy) > l {`)
@@ -1510,16 +1505,11 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) {
 		p.P(`if err != nil {`)
 		p.In()
 		p.P(`return err`)
 		p.Out()
 		p.P(`}`)
-		p.P(`if skippy < 0 {`)
-		p.In()
-		p.P(`return ErrInvalidLength`, p.localName)
-		p.Out()
-		p.P(`}`)
-		p.P(`if (iNdEx + skippy) < 0 {`)
+		p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`)
 		p.In()
 		p.P(`return ErrInvalidLength`, p.localName)
 		p.Out()
 		p.P(`}`)
 		p.P(`if (iNdEx + skippy) > l {`)
diff --git a/test/asymetric-issue125/asym.pb.go b/test/asymetric-issue125/asym.pb.go
index a960a97c..4a5bd85d 100644
--- a/test/asymetric-issue125/asym.pb.go
+++ b/test/asymetric-issue125/asym.pb.go
@@ -471,14 +471,11 @@ func (m *M) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipAsym(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthAsym
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthAsym
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -525,14 +522,11 @@ func (m *MyType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipAsym(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthAsym
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthAsym
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/casttype/combos/both/casttype.pb.go b/test/casttype/combos/both/casttype.pb.go
index 0191067f..9436098a 100644
--- a/test/casttype/combos/both/casttype.pb.go
+++ b/test/casttype/combos/both/casttype.pb.go
@@ -2062,11 +2062,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCasttype(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCasttype
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2175,11 +2175,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCasttype(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCasttype
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2290,11 +2290,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCasttype(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCasttype
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2405,11 +2405,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCasttype(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCasttype
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2455,14 +2455,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipCasttype(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthCasttype
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthCasttype
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2529,14 +2526,11 @@ func (m *Wilson) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipCasttype(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthCasttype
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthCasttype
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/casttype/combos/unmarshaler/casttype.pb.go b/test/casttype/combos/unmarshaler/casttype.pb.go
index 4f61c035..442e05fb 100644
--- a/test/casttype/combos/unmarshaler/casttype.pb.go
+++ b/test/casttype/combos/unmarshaler/casttype.pb.go
@@ -1828,11 +1828,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCasttype(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCasttype
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -1941,11 +1941,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCasttype(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCasttype
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2056,11 +2056,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCasttype(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCasttype
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2171,11 +2171,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCasttype(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCasttype
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2221,14 +2221,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipCasttype(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthCasttype
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthCasttype
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2295,14 +2292,11 @@ func (m *Wilson) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipCasttype(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthCasttype
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthCasttype
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/castvalue/combos/both/castvalue.pb.go b/test/castvalue/combos/both/castvalue.pb.go
index aa00bc65..60c14ca6 100644
--- a/test/castvalue/combos/both/castvalue.pb.go
+++ b/test/castvalue/combos/both/castvalue.pb.go
@@ -1166,11 +1166,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCastvalue(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCastvalue
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -1281,11 +1281,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCastvalue(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCastvalue
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -1298,14 +1298,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipCastvalue(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthCastvalue
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthCastvalue
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1372,14 +1369,11 @@ func (m *Wilson) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipCastvalue(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthCastvalue
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthCastvalue
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/castvalue/combos/unmarshaler/castvalue.pb.go b/test/castvalue/combos/unmarshaler/castvalue.pb.go
index 462bd6bf..5139c879 100644
--- a/test/castvalue/combos/unmarshaler/castvalue.pb.go
+++ b/test/castvalue/combos/unmarshaler/castvalue.pb.go
@@ -1034,11 +1034,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCastvalue(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCastvalue
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -1149,11 +1149,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipCastvalue(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthCastvalue
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -1166,14 +1166,11 @@ func (m *Castaway) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipCastvalue(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthCastvalue
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthCastvalue
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1240,14 +1237,11 @@ func (m *Wilson) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipCastvalue(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthCastvalue
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthCastvalue
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/combos/both/thetest.pb.go b/test/combos/both/thetest.pb.go
index b1f0e7e1..d6b45ccb 100644
--- a/test/combos/both/thetest.pb.go
+++ b/test/combos/both/thetest.pb.go
@@ -32574,14 +32574,11 @@ func (m *NidOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -32907,14 +32904,11 @@ func (m *NinOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -33871,14 +33865,11 @@ func (m *NidRepNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -34835,14 +34826,11 @@ func (m *NinRepNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35735,14 +35723,11 @@ func (m *NidRepPackedNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36635,14 +36620,11 @@ func (m *NinRepPackedNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36936,14 +36918,11 @@ func (m *NidOptStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37251,14 +37230,11 @@ func (m *NinOptStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37803,14 +37779,11 @@ func (m *NidRepStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38355,14 +38328,11 @@ func (m *NinRepStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38498,14 +38468,11 @@ func (m *NidEmbeddedStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38645,14 +38612,11 @@ func (m *NinEmbeddedStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38766,14 +38730,11 @@ func (m *NidNestedStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38890,14 +38851,11 @@ func (m *NinNestedStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -39010,14 +38968,11 @@ func (m *NidOptCustom) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -39099,14 +39054,11 @@ func (m *CustomDash) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -39223,14 +39175,11 @@ func (m *NinOptCustom) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -39347,14 +39296,11 @@ func (m *NidRepCustom) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -39471,14 +39417,11 @@ func (m *NinRepCustom) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -39717,14 +39660,11 @@ func (m *NinOptNativeUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -39996,14 +39936,11 @@ func (m *NinOptStructUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40143,14 +40080,11 @@ func (m *NinEmbeddedStructUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40305,14 +40239,11 @@ func (m *NinNestedStructUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40467,14 +40398,11 @@ func (m *Tree) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40587,14 +40515,11 @@ func (m *OrBranch) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40707,14 +40632,11 @@ func (m *AndBranch) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40812,14 +40734,11 @@ func (m *Leaf) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40974,14 +40893,11 @@ func (m *DeepTree) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41061,14 +40977,11 @@ func (m *ADeepBranch) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41181,14 +41094,11 @@ func (m *AndDeepBranch) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41268,14 +41178,11 @@ func (m *DeepLeaf) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41322,14 +41229,11 @@ func (m *Nil) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41395,14 +41299,11 @@ func (m *NidOptEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41509,14 +41410,11 @@ func (m *NinOptEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41770,14 +41668,11 @@ func (m *NidRepEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42031,14 +41926,11 @@ func (m *NinRepEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42145,14 +42037,11 @@ func (m *NinOptEnumDefault) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42259,14 +42148,11 @@ func (m *AnotherNinOptEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42373,14 +42259,11 @@ func (m *AnotherNinOptEnumDefault) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42481,14 +42364,11 @@ func (m *Timer) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42564,14 +42444,11 @@ func (m *MyExtendable) Unmarshal(dAtA []byte) error {
 				iNdEx -= sizeOfWire
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -42581,14 +42458,11 @@ func (m *MyExtendable) Unmarshal(dAtA []byte) error {
 				iNdEx = preIndex
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -42721,14 +42595,11 @@ func (m *OtherExtenable) Unmarshal(dAtA []byte) error {
 				iNdEx -= sizeOfWire
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -42738,14 +42609,11 @@ func (m *OtherExtenable) Unmarshal(dAtA []byte) error {
 				iNdEx = preIndex
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -42905,14 +42773,11 @@ func (m *NestedDefinition) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -43006,14 +42871,11 @@ func (m *NestedDefinition_NestedMessage) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -43093,14 +42955,11 @@ func (m *NestedDefinition_NestedMessage_NestedNestedMsg) Unmarshal(dAtA []byte)
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -43239,14 +43098,11 @@ func (m *NestedScope) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -43572,14 +43428,11 @@ func (m *NinOptNativeDefault) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -43659,14 +43512,11 @@ func (m *CustomContainer) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -43979,14 +43829,11 @@ func (m *CustomNameNidOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -44312,14 +44159,11 @@ func (m *CustomNameNinOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -45276,14 +45120,11 @@ func (m *CustomNameNinRepNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -45589,14 +45430,11 @@ func (m *CustomNameNinStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -45783,14 +45621,11 @@ func (m *CustomNameCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -45930,14 +45765,11 @@ func (m *CustomNameNinEmbeddedStructUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46073,14 +45905,11 @@ func (m *CustomNameEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46156,14 +45985,11 @@ func (m *NoExtensionsMap) Unmarshal(dAtA []byte) error {
 				iNdEx -= sizeOfWire
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -46173,14 +45999,11 @@ func (m *NoExtensionsMap) Unmarshal(dAtA []byte) error {
 				iNdEx = preIndex
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -46261,14 +46084,11 @@ func (m *Unrecognized) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46381,14 +46201,11 @@ func (m *UnrecognizedWithInner) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46455,14 +46272,11 @@ func (m *UnrecognizedWithInner_Inner) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46574,14 +46388,11 @@ func (m *UnrecognizedWithEmbed) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46648,14 +46459,11 @@ func (m *UnrecognizedWithEmbed_Embedded) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46768,14 +46576,11 @@ func (m *Node) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46858,14 +46663,11 @@ func (m *NonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -46945,14 +46747,11 @@ func (m *NidOptNonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -47035,14 +46834,11 @@ func (m *NinOptNonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -47123,14 +46919,11 @@ func (m *NidRepNonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -47211,14 +47004,11 @@ func (m *NinRepNonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -47298,14 +47088,11 @@ func (m *ProtoType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/combos/unmarshaler/thetest.pb.go b/test/combos/unmarshaler/thetest.pb.go
index 22b1625a..5e542ddb 100644
--- a/test/combos/unmarshaler/thetest.pb.go
+++ b/test/combos/unmarshaler/thetest.pb.go
@@ -27454,14 +27454,11 @@ func (m *NidOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -27787,14 +27784,11 @@ func (m *NinOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -28751,14 +28745,11 @@ func (m *NidRepNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -29715,14 +29706,11 @@ func (m *NinRepNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -30615,14 +30603,11 @@ func (m *NidRepPackedNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -31515,14 +31500,11 @@ func (m *NinRepPackedNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -31816,14 +31798,11 @@ func (m *NidOptStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -32131,14 +32110,11 @@ func (m *NinOptStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -32683,14 +32659,11 @@ func (m *NidRepStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -33235,14 +33208,11 @@ func (m *NinRepStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -33378,14 +33348,11 @@ func (m *NidEmbeddedStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -33525,14 +33492,11 @@ func (m *NinEmbeddedStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -33646,14 +33610,11 @@ func (m *NidNestedStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -33770,14 +33731,11 @@ func (m *NinNestedStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -33890,14 +33848,11 @@ func (m *NidOptCustom) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -33979,14 +33934,11 @@ func (m *CustomDash) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -34103,14 +34055,11 @@ func (m *NinOptCustom) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -34227,14 +34176,11 @@ func (m *NidRepCustom) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -34351,14 +34297,11 @@ func (m *NinRepCustom) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -34597,14 +34540,11 @@ func (m *NinOptNativeUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -34876,14 +34816,11 @@ func (m *NinOptStructUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35023,14 +34960,11 @@ func (m *NinEmbeddedStructUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35185,14 +35119,11 @@ func (m *NinNestedStructUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35347,14 +35278,11 @@ func (m *Tree) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35467,14 +35395,11 @@ func (m *OrBranch) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35587,14 +35512,11 @@ func (m *AndBranch) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35692,14 +35614,11 @@ func (m *Leaf) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35854,14 +35773,11 @@ func (m *DeepTree) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -35941,14 +35857,11 @@ func (m *ADeepBranch) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36061,14 +35974,11 @@ func (m *AndDeepBranch) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36148,14 +36058,11 @@ func (m *DeepLeaf) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36202,14 +36109,11 @@ func (m *Nil) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36275,14 +36179,11 @@ func (m *NidOptEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36389,14 +36290,11 @@ func (m *NinOptEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36650,14 +36548,11 @@ func (m *NidRepEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -36911,14 +36806,11 @@ func (m *NinRepEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37025,14 +36917,11 @@ func (m *NinOptEnumDefault) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37139,14 +37028,11 @@ func (m *AnotherNinOptEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37253,14 +37139,11 @@ func (m *AnotherNinOptEnumDefault) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37361,14 +37244,11 @@ func (m *Timer) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37444,14 +37324,11 @@ func (m *MyExtendable) Unmarshal(dAtA []byte) error {
 				iNdEx -= sizeOfWire
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -37461,14 +37338,11 @@ func (m *MyExtendable) Unmarshal(dAtA []byte) error {
 				iNdEx = preIndex
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -37601,14 +37475,11 @@ func (m *OtherExtenable) Unmarshal(dAtA []byte) error {
 				iNdEx -= sizeOfWire
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -37618,14 +37489,11 @@ func (m *OtherExtenable) Unmarshal(dAtA []byte) error {
 				iNdEx = preIndex
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -37785,14 +37653,11 @@ func (m *NestedDefinition) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37886,14 +37751,11 @@ func (m *NestedDefinition_NestedMessage) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -37973,14 +37835,11 @@ func (m *NestedDefinition_NestedMessage_NestedNestedMsg) Unmarshal(dAtA []byte)
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38119,14 +37978,11 @@ func (m *NestedScope) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38452,14 +38308,11 @@ func (m *NinOptNativeDefault) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38539,14 +38392,11 @@ func (m *CustomContainer) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -38859,14 +38709,11 @@ func (m *CustomNameNidOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -39192,14 +39039,11 @@ func (m *CustomNameNinOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40156,14 +40000,11 @@ func (m *CustomNameNinRepNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40469,14 +40310,11 @@ func (m *CustomNameNinStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40663,14 +40501,11 @@ func (m *CustomNameCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40810,14 +40645,11 @@ func (m *CustomNameNinEmbeddedStructUnion) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -40953,14 +40785,11 @@ func (m *CustomNameEnum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41036,14 +40865,11 @@ func (m *NoExtensionsMap) Unmarshal(dAtA []byte) error {
 				iNdEx -= sizeOfWire
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -41053,14 +40879,11 @@ func (m *NoExtensionsMap) Unmarshal(dAtA []byte) error {
 				iNdEx = preIndex
 				skippy, err := skipThetest(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthThetest
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthThetest
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -41141,14 +40964,11 @@ func (m *Unrecognized) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41261,14 +41081,11 @@ func (m *UnrecognizedWithInner) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41335,14 +41152,11 @@ func (m *UnrecognizedWithInner_Inner) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41454,14 +41268,11 @@ func (m *UnrecognizedWithEmbed) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41528,14 +41339,11 @@ func (m *UnrecognizedWithEmbed_Embedded) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41648,14 +41456,11 @@ func (m *Node) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41738,14 +41543,11 @@ func (m *NonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41825,14 +41627,11 @@ func (m *NidOptNonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -41915,14 +41714,11 @@ func (m *NinOptNonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42003,14 +41799,11 @@ func (m *NidRepNonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42091,14 +41884,11 @@ func (m *NinRepNonByteCustomType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -42178,14 +41968,11 @@ func (m *ProtoType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipThetest(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthThetest
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthThetest
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/custombytesnonstruct/proto.pb.go b/test/custombytesnonstruct/proto.pb.go
index 1986833b..b518785c 100644
--- a/test/custombytesnonstruct/proto.pb.go
+++ b/test/custombytesnonstruct/proto.pb.go
@@ -177,14 +177,11 @@ func (m *Object) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipProto(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthProto
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProto
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/data/data.pb.go b/test/data/data.pb.go
index ccc7cd05..01612ec6 100644
--- a/test/data/data.pb.go
+++ b/test/data/data.pb.go
@@ -389,14 +389,11 @@ func (m *MyMessage) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipData(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthData
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthData
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/empty-issue70/empty.pb.go b/test/empty-issue70/empty.pb.go
index 9e97bf20..e67f8383 100644
--- a/test/empty-issue70/empty.pb.go
+++ b/test/empty-issue70/empty.pb.go
@@ -101,14 +101,11 @@ func (m *TestRequest) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipEmpty(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthEmpty
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthEmpty
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/enumdecl/enumdecl.pb.go b/test/enumdecl/enumdecl.pb.go
index cbc48972..e6e06710 100644
--- a/test/enumdecl/enumdecl.pb.go
+++ b/test/enumdecl/enumdecl.pb.go
@@ -370,14 +370,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipEnumdecl(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthEnumdecl
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthEnumdecl
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/enumdecl_all/enumdeclall.pb.go b/test/enumdecl_all/enumdeclall.pb.go
index 7c7deae7..48dd7bb7 100644
--- a/test/enumdecl_all/enumdeclall.pb.go
+++ b/test/enumdecl_all/enumdeclall.pb.go
@@ -442,14 +442,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipEnumdeclall(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthEnumdeclall
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthEnumdeclall
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/example/example.pb.go b/test/example/example.pb.go
index 7fffdfa8..a340b966 100644
--- a/test/example/example.pb.go
+++ b/test/example/example.pb.go
@@ -2116,14 +2116,11 @@ func (m *A) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipExample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthExample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthExample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2238,14 +2235,11 @@ func (m *B) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipExample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthExample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthExample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2312,14 +2306,11 @@ func (m *C) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipExample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthExample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthExample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2438,14 +2429,11 @@ func (m *U) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipExample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthExample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthExample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2501,14 +2489,11 @@ func (m *E) Unmarshal(dAtA []byte) error {
 				iNdEx -= sizeOfWire
 				skippy, err := skipExample(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthExample
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthExample
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -2518,14 +2503,11 @@ func (m *E) Unmarshal(dAtA []byte) error {
 				iNdEx = preIndex
 				skippy, err := skipExample(dAtA[iNdEx:])
 				if err != nil {
 					return err
 				}
-				if skippy < 0 {
-					return ErrInvalidLengthExample
-				}
-				if (iNdEx + skippy) < 0 {
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
 					return ErrInvalidLengthExample
 				}
 				if (iNdEx + skippy) > l {
 					return io.ErrUnexpectedEOF
 				}
@@ -2593,14 +2575,11 @@ func (m *R) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipExample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthExample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthExample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2666,14 +2645,11 @@ func (m *CastType) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipExample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthExample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthExample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/fuzztests/fuzz.pb.go b/test/fuzztests/fuzz.pb.go
index 57a38201..03f57dda 100644
--- a/test/fuzztests/fuzz.pb.go
+++ b/test/fuzztests/fuzz.pb.go
@@ -1401,14 +1401,11 @@ func (m *Nil) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipFuzz(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthFuzz
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthFuzz
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2301,14 +2298,11 @@ func (m *NinRepPackedNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipFuzz(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthFuzz
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthFuzz
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2634,14 +2628,11 @@ func (m *NinOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipFuzz(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthFuzz
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthFuzz
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2949,14 +2940,11 @@ func (m *NinOptStruct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipFuzz(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthFuzz
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthFuzz
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/importcustom-issue389/imported/a.pb.go b/test/importcustom-issue389/imported/a.pb.go
index 4c56662b..54f5e15f 100644
--- a/test/importcustom-issue389/imported/a.pb.go
+++ b/test/importcustom-issue389/imported/a.pb.go
@@ -329,14 +329,11 @@ func (m *A) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipA(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthA
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthA
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/importcustom-issue389/importing/c.pb.go b/test/importcustom-issue389/importing/c.pb.go
index 39eaec46..3b3006e3 100644
--- a/test/importcustom-issue389/importing/c.pb.go
+++ b/test/importcustom-issue389/importing/c.pb.go
@@ -343,14 +343,11 @@ func (m *C) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipC(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthC
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthC
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/indeximport-issue72/index/index.pb.go b/test/indeximport-issue72/index/index.pb.go
index 01035cd4..b0f604d3 100644
--- a/test/indeximport-issue72/index/index.pb.go
+++ b/test/indeximport-issue72/index/index.pb.go
@@ -405,14 +405,11 @@ func (m *IndexQuery) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIndex(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIndex
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIndex
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/indeximport-issue72/indeximport.pb.go b/test/indeximport-issue72/indeximport.pb.go
index a945b5d7..ef6cca9e 100644
--- a/test/indeximport-issue72/indeximport.pb.go
+++ b/test/indeximport-issue72/indeximport.pb.go
@@ -355,14 +355,11 @@ func (m *IndexQueries) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIndeximport(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIndeximport
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIndeximport
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/int64support/object.pb.go b/test/int64support/object.pb.go
index 44b50cbb..e2d7fb7b 100644
--- a/test/int64support/object.pb.go
+++ b/test/int64support/object.pb.go
@@ -392,14 +392,11 @@ func (m *Object) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipObject(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthObject
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthObject
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue260/issue260.pb.go b/test/issue260/issue260.pb.go
index 64c0a318..6ea59542 100644
--- a/test/issue260/issue260.pb.go
+++ b/test/issue260/issue260.pb.go
@@ -753,14 +753,11 @@ func (m *Dropped) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue260(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue260
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue260
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -877,14 +874,11 @@ func (m *DroppedWithoutGetters) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue260(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue260
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue260
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -981,14 +975,11 @@ func (m *Kept) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue260(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue260
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue260
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue261/issue261.pb.go b/test/issue261/issue261.pb.go
index e2ba9bcf..f6db9ab4 100644
--- a/test/issue261/issue261.pb.go
+++ b/test/issue261/issue261.pb.go
@@ -403,11 +403,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipIssue261(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthIssue261
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -420,14 +420,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue261(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue261
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue261
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue262/timefail.pb.go b/test/issue262/timefail.pb.go
index b7377ee8..f4ff326a 100644
--- a/test/issue262/timefail.pb.go
+++ b/test/issue262/timefail.pb.go
@@ -292,14 +292,11 @@ func (m *TimeFail) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTimefail(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTimefail
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTimefail
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue322/issue322.pb.go b/test/issue322/issue322.pb.go
index e124f2df..992afb2c 100644
--- a/test/issue322/issue322.pb.go
+++ b/test/issue322/issue322.pb.go
@@ -544,14 +544,11 @@ func (m *OneofTest) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue322(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue322
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue322
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue330/issue330.pb.go b/test/issue330/issue330.pb.go
index 94648e3b..88d6cf22 100644
--- a/test/issue330/issue330.pb.go
+++ b/test/issue330/issue330.pb.go
@@ -315,14 +315,11 @@ func (m *Object) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue330(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue330
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue330
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue34/proto.pb.go b/test/issue34/proto.pb.go
index 6eedb6e6..e1ac088b 100644
--- a/test/issue34/proto.pb.go
+++ b/test/issue34/proto.pb.go
@@ -184,14 +184,11 @@ func (m *Foo) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipProto(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthProto
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProto
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -270,14 +267,11 @@ func (m *FooWithRepeated) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipProto(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthProto
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProto
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue42order/issue42.pb.go b/test/issue42order/issue42.pb.go
index 4d7eb42a..1217b19c 100644
--- a/test/issue42order/issue42.pb.go
+++ b/test/issue42order/issue42.pb.go
@@ -458,14 +458,11 @@ func (m *UnorderedFields) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue42(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue42
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue42
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -543,14 +540,11 @@ func (m *OrderedFields) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue42(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue42
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue42
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue449/issue449.pb.go b/test/issue449/issue449.pb.go
index f0167d91..984aed9a 100644
--- a/test/issue449/issue449.pb.go
+++ b/test/issue449/issue449.pb.go
@@ -474,14 +474,11 @@ func (m *CodeGenMsg) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue449(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue449
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue449
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue498/issue498.pb.go b/test/issue498/issue498.pb.go
index 6aefa13e..f47e68bd 100644
--- a/test/issue498/issue498.pb.go
+++ b/test/issue498/issue498.pb.go
@@ -480,14 +480,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue498(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue498
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue498
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue503/issue503.pb.go b/test/issue503/issue503.pb.go
index e15b91ef..d9bfb0cd 100644
--- a/test/issue503/issue503.pb.go
+++ b/test/issue503/issue503.pb.go
@@ -731,14 +731,11 @@ func (m *Foo) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue503(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue503
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue503
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue530/issue530.pb.go b/test/issue530/issue530.pb.go
index 63508479..5edca49e 100644
--- a/test/issue530/issue530.pb.go
+++ b/test/issue530/issue530.pb.go
@@ -2640,11 +2640,11 @@ func (m *Foo5) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipIssue530(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthIssue530
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2769,11 +2769,11 @@ func (m *Foo5) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipIssue530(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthIssue530
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -2786,14 +2786,11 @@ func (m *Foo5) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2871,14 +2868,11 @@ func (m *Bar1) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2957,14 +2951,11 @@ func (m *Bar2) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3078,14 +3069,11 @@ func (m *Bar3) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3163,14 +3151,11 @@ func (m *Bar4) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3284,14 +3269,11 @@ func (m *Bar5) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3470,14 +3452,11 @@ func (m *Bar7) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3557,14 +3536,11 @@ func (m *Bar8) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3642,14 +3618,11 @@ func (m *Bar9) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue530(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue530
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue530
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue617/issue617.pb.go b/test/issue617/issue617.pb.go
index 4763a898..9aa743d5 100644
--- a/test/issue617/issue617.pb.go
+++ b/test/issue617/issue617.pb.go
@@ -366,14 +366,11 @@ func (m *Foo) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue617(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue617
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue617
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -420,14 +417,11 @@ func (m *Foo_Bar) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipIssue617(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthIssue617
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthIssue617
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/issue8/proto.pb.go b/test/issue8/proto.pb.go
index 36472aa8..6da5317d 100644
--- a/test/issue8/proto.pb.go
+++ b/test/issue8/proto.pb.go
@@ -249,14 +249,11 @@ func (m *Foo) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipProto(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthProto
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProto
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/mapdefaults/combos/both/map.pb.go b/test/mapdefaults/combos/both/map.pb.go
index d0938641..4b8cfee8 100644
--- a/test/mapdefaults/combos/both/map.pb.go
+++ b/test/mapdefaults/combos/both/map.pb.go
@@ -1265,11 +1265,11 @@ func (m *MapTest) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMap(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMap
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -1282,14 +1282,11 @@ func (m *MapTest) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMap(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMap
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMap
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1370,14 +1367,11 @@ func (m *FakeMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMap(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMap
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMap
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1520,14 +1514,11 @@ func (m *FakeMapEntry) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMap(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMap
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMap
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/mapdefaults/combos/unmarshaler/map.pb.go b/test/mapdefaults/combos/unmarshaler/map.pb.go
index fbbc32e8..ae1092e0 100644
--- a/test/mapdefaults/combos/unmarshaler/map.pb.go
+++ b/test/mapdefaults/combos/unmarshaler/map.pb.go
@@ -1092,11 +1092,11 @@ func (m *MapTest) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMap(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMap
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -1109,14 +1109,11 @@ func (m *MapTest) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMap(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMap
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMap
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1197,14 +1194,11 @@ func (m *FakeMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMap(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMap
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMap
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1347,14 +1341,11 @@ func (m *FakeMapEntry) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMap(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMap
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMap
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/mapsproto2/combos/both/mapsproto2.pb.go b/test/mapsproto2/combos/both/mapsproto2.pb.go
index 0b7ae4a7..4d64e362 100644
--- a/test/mapsproto2/combos/both/mapsproto2.pb.go
+++ b/test/mapsproto2/combos/both/mapsproto2.pb.go
@@ -4717,14 +4717,11 @@ func (m *FloatingPoint) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMapsproto2(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMapsproto2
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMapsproto2
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -4884,11 +4881,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5014,11 +5011,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5144,11 +5141,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5274,11 +5271,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5291,14 +5288,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMapsproto2(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMapsproto2
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMapsproto2
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -5434,11 +5428,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5540,11 +5534,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5639,11 +5633,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5738,11 +5732,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5837,11 +5831,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5936,11 +5930,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6041,11 +6035,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6146,11 +6140,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6227,11 +6221,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6308,11 +6302,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6389,11 +6383,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6470,11 +6464,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6573,11 +6567,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6700,11 +6694,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6828,11 +6822,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6941,11 +6935,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7070,11 +7064,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7087,14 +7081,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMapsproto2(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMapsproto2
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMapsproto2
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -7230,11 +7221,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7336,11 +7327,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7435,11 +7426,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7534,11 +7525,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7633,11 +7624,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7732,11 +7723,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7837,11 +7828,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7942,11 +7933,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8023,11 +8014,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8104,11 +8095,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8185,11 +8176,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8266,11 +8257,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8369,11 +8360,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8496,11 +8487,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8624,11 +8615,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8737,11 +8728,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8866,11 +8857,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8883,14 +8874,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMapsproto2(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMapsproto2
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMapsproto2
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go b/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go
index b0cc8bb2..7ecb4c1f 100644
--- a/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go
+++ b/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go
@@ -3765,14 +3765,11 @@ func (m *FloatingPoint) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMapsproto2(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMapsproto2
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMapsproto2
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3932,11 +3929,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4062,11 +4059,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4192,11 +4189,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4322,11 +4319,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4339,14 +4336,11 @@ func (m *CustomMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMapsproto2(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMapsproto2
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMapsproto2
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -4482,11 +4476,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4588,11 +4582,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4687,11 +4681,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4786,11 +4780,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4885,11 +4879,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -4984,11 +4978,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5089,11 +5083,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5194,11 +5188,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5275,11 +5269,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5356,11 +5350,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5437,11 +5431,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5518,11 +5512,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5621,11 +5615,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5748,11 +5742,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5876,11 +5870,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5989,11 +5983,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6118,11 +6112,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6135,14 +6129,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMapsproto2(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMapsproto2
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMapsproto2
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -6278,11 +6269,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6384,11 +6375,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6483,11 +6474,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6582,11 +6573,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6681,11 +6672,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6780,11 +6771,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6885,11 +6876,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6990,11 +6981,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7071,11 +7062,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7152,11 +7143,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7233,11 +7224,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7314,11 +7305,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7417,11 +7408,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7544,11 +7535,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7672,11 +7663,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7785,11 +7776,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7914,11 +7905,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipMapsproto2(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthMapsproto2
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7931,14 +7922,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipMapsproto2(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthMapsproto2
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthMapsproto2
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/nopackage/nopackage.pb.go b/test/nopackage/nopackage.pb.go
index a7d1dc71..f4b38dd7 100644
--- a/test/nopackage/nopackage.pb.go
+++ b/test/nopackage/nopackage.pb.go
@@ -294,11 +294,11 @@ func (m *M) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipNopackage(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthNopackage
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -311,14 +311,11 @@ func (m *M) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipNopackage(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthNopackage
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthNopackage
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/oneof/combos/both/one.pb.go b/test/oneof/combos/both/one.pb.go
index faf9e258..905dd218 100644
--- a/test/oneof/combos/both/one.pb.go
+++ b/test/oneof/combos/both/one.pb.go
@@ -5728,14 +5728,11 @@ func (m *Subby) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -6091,14 +6088,11 @@ func (m *AllTypesOneOf) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -6287,14 +6281,11 @@ func (m *TwoOneofs) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -6449,14 +6440,11 @@ func (m *CustomOneof) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/oneof/combos/unmarshaler/one.pb.go b/test/oneof/combos/unmarshaler/one.pb.go
index e9933793..937ebe52 100644
--- a/test/oneof/combos/unmarshaler/one.pb.go
+++ b/test/oneof/combos/unmarshaler/one.pb.go
@@ -5146,14 +5146,11 @@ func (m *Subby) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -5509,14 +5506,11 @@ func (m *AllTypesOneOf) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -5705,14 +5699,11 @@ func (m *TwoOneofs) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -5867,14 +5858,11 @@ func (m *CustomOneof) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/oneof3/combos/both/one.pb.go b/test/oneof3/combos/both/one.pb.go
index c70658c5..3b3825a8 100644
--- a/test/oneof3/combos/both/one.pb.go
+++ b/test/oneof3/combos/both/one.pb.go
@@ -3479,14 +3479,11 @@ func (m *Subby) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3842,14 +3839,11 @@ func (m *SampleOneOf) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/oneof3/combos/unmarshaler/one.pb.go b/test/oneof3/combos/unmarshaler/one.pb.go
index 5a3cbc25..07c839b7 100644
--- a/test/oneof3/combos/unmarshaler/one.pb.go
+++ b/test/oneof3/combos/unmarshaler/one.pb.go
@@ -3159,14 +3159,11 @@ func (m *Subby) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3522,14 +3519,11 @@ func (m *SampleOneOf) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipOne(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthOne
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthOne
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/packed/packed.pb.go b/test/packed/packed.pb.go
index eb540092..d04c8ae9 100644
--- a/test/packed/packed.pb.go
+++ b/test/packed/packed.pb.go
@@ -2040,14 +2040,11 @@ func (m *NinRepNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipPacked(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthPacked
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthPacked
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2940,14 +2937,11 @@ func (m *NinRepPackedNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipPacked(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthPacked
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthPacked
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3840,14 +3834,11 @@ func (m *NinRepNativeUnsafe) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipPacked(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthPacked
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthPacked
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -4740,14 +4731,11 @@ func (m *NinRepPackedNativeUnsafe) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipPacked(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthPacked
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthPacked
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/protosize/protosize.pb.go b/test/protosize/protosize.pb.go
index b40179a8..97d80d34 100644
--- a/test/protosize/protosize.pb.go
+++ b/test/protosize/protosize.pb.go
@@ -502,14 +502,11 @@ func (m *SizeMessage) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipProtosize(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthProtosize
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProtosize
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/required/requiredexample.pb.go b/test/required/requiredexample.pb.go
index 444000a7..523e8657 100644
--- a/test/required/requiredexample.pb.go
+++ b/test/required/requiredexample.pb.go
@@ -1333,14 +1333,11 @@ func (m *RequiredExample) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipRequiredexample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthRequiredexample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthRequiredexample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1672,14 +1669,11 @@ func (m *NidOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipRequiredexample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthRequiredexample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthRequiredexample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2066,14 +2060,11 @@ func (m *NinOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipRequiredexample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthRequiredexample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthRequiredexample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2199,14 +2190,11 @@ func (m *NestedNinOptNative) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipRequiredexample(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthRequiredexample
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthRequiredexample
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/sizeunderscore/sizeunderscore.pb.go b/test/sizeunderscore/sizeunderscore.pb.go
index e51ca10a..508d8434 100644
--- a/test/sizeunderscore/sizeunderscore.pb.go
+++ b/test/sizeunderscore/sizeunderscore.pb.go
@@ -449,14 +449,11 @@ func (m *SizeMessage) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipSizeunderscore(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthSizeunderscore
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthSizeunderscore
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/theproto3/combos/both/theproto3.pb.go b/test/theproto3/combos/both/theproto3.pb.go
index 7aa16af0..37c672df 100644
--- a/test/theproto3/combos/both/theproto3.pb.go
+++ b/test/theproto3/combos/both/theproto3.pb.go
@@ -7017,11 +7017,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7168,11 +7168,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7185,14 +7185,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -7271,14 +7268,11 @@ func (m *Nested) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -7414,11 +7408,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7520,11 +7514,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7619,11 +7613,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7718,11 +7712,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7817,11 +7811,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7916,11 +7910,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8021,11 +8015,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8126,11 +8120,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8207,11 +8201,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8288,11 +8282,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8369,11 +8363,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8450,11 +8444,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8553,11 +8547,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8680,11 +8674,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8808,11 +8802,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8921,11 +8915,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9050,11 +9044,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9067,14 +9061,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -9210,11 +9201,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9316,11 +9307,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9415,11 +9406,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9514,11 +9505,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9613,11 +9604,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9712,11 +9703,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9817,11 +9808,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9922,11 +9913,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10003,11 +9994,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10084,11 +10075,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10165,11 +10156,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10246,11 +10237,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10349,11 +10340,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10476,11 +10467,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10604,11 +10595,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10717,11 +10708,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10846,11 +10837,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10863,14 +10854,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -11013,11 +11001,11 @@ func (m *MessageWithMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -11131,11 +11119,11 @@ func (m *MessageWithMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -11247,11 +11235,11 @@ func (m *MessageWithMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -11264,14 +11252,11 @@ func (m *MessageWithMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -11329,14 +11314,11 @@ func (m *FloatingPoint) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -11451,14 +11433,11 @@ func (m *Uint128Pair) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -11505,14 +11484,11 @@ func (m *ContainsNestedMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -11648,11 +11624,11 @@ func (m *ContainsNestedMap_NestedMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -11665,14 +11641,11 @@ func (m *ContainsNestedMap_NestedMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -11795,14 +11768,11 @@ func (m *NotPacked) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/theproto3/combos/unmarshaler/theproto3.pb.go b/test/theproto3/combos/unmarshaler/theproto3.pb.go
index c27ff2c3..8b4e03a7 100644
--- a/test/theproto3/combos/unmarshaler/theproto3.pb.go
+++ b/test/theproto3/combos/unmarshaler/theproto3.pb.go
@@ -5696,11 +5696,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5847,11 +5847,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -5864,14 +5864,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -5950,14 +5947,11 @@ func (m *Nested) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -6093,11 +6087,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6199,11 +6193,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6298,11 +6292,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6397,11 +6391,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6496,11 +6490,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6595,11 +6589,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6700,11 +6694,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6805,11 +6799,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6886,11 +6880,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -6967,11 +6961,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7048,11 +7042,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7129,11 +7123,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7232,11 +7226,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7359,11 +7353,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7487,11 +7481,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7600,11 +7594,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7729,11 +7723,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7746,14 +7740,11 @@ func (m *AllMaps) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -7889,11 +7880,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -7995,11 +7986,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8094,11 +8085,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8193,11 +8184,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8292,11 +8283,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8391,11 +8382,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8496,11 +8487,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8601,11 +8592,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8682,11 +8673,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8763,11 +8754,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8844,11 +8835,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -8925,11 +8916,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9028,11 +9019,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9155,11 +9146,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9283,11 +9274,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9396,11 +9387,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9525,11 +9516,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9542,14 +9533,11 @@ func (m *AllMapsOrdered) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -9692,11 +9680,11 @@ func (m *MessageWithMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9810,11 +9798,11 @@ func (m *MessageWithMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9926,11 +9914,11 @@ func (m *MessageWithMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -9943,14 +9931,11 @@ func (m *MessageWithMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -10008,14 +9993,11 @@ func (m *FloatingPoint) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -10130,14 +10112,11 @@ func (m *Uint128Pair) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -10184,14 +10163,11 @@ func (m *ContainsNestedMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -10327,11 +10303,11 @@ func (m *ContainsNestedMap_NestedMap) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTheproto3(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTheproto3
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -10344,14 +10320,11 @@ func (m *ContainsNestedMap_NestedMap) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -10474,14 +10447,11 @@ func (m *NotPacked) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTheproto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTheproto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTheproto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/typedecl/typedecl.pb.go b/test/typedecl/typedecl.pb.go
index b733d849..9184a49f 100644
--- a/test/typedecl/typedecl.pb.go
+++ b/test/typedecl/typedecl.pb.go
@@ -727,14 +727,11 @@ func (m *Dropped) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypedecl(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypedecl
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypedecl
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -818,14 +815,11 @@ func (m *DroppedWithoutGetters) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypedecl(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypedecl
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypedecl
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -922,14 +916,11 @@ func (m *Kept) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypedecl(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypedecl
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypedecl
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/typedecl_all/typedeclall.pb.go b/test/typedecl_all/typedeclall.pb.go
index 545b11f8..1e08017d 100644
--- a/test/typedecl_all/typedeclall.pb.go
+++ b/test/typedecl_all/typedeclall.pb.go
@@ -727,14 +727,11 @@ func (m *Dropped) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypedeclall(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypedeclall
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypedeclall
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -818,14 +815,11 @@ func (m *DroppedWithoutGetters) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypedeclall(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypedeclall
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypedeclall
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -922,14 +916,11 @@ func (m *Kept) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypedeclall(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypedeclall
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypedeclall
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/types/combos/both/types.pb.go b/test/types/combos/both/types.pb.go
index bcfa037e..b55bc517 100644
--- a/test/types/combos/both/types.pb.go
+++ b/test/types/combos/both/types.pb.go
@@ -12115,14 +12115,11 @@ func (m *KnownTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -12928,14 +12925,11 @@ func (m *ProtoTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -13741,14 +13735,11 @@ func (m *StdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -14543,14 +14534,11 @@ func (m *RepProtoTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -15345,14 +15333,11 @@ func (m *RepStdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -15497,11 +15482,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15612,11 +15597,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15727,11 +15712,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15842,11 +15827,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15957,11 +15942,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16072,11 +16057,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16187,11 +16172,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16302,11 +16287,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16417,11 +16402,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16532,11 +16517,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16647,11 +16632,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16762,11 +16747,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16877,11 +16862,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16992,11 +16977,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17107,11 +17092,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17222,11 +17207,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17337,11 +17322,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17452,11 +17437,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17567,11 +17552,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17682,11 +17667,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17797,11 +17782,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17912,11 +17897,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17929,14 +17914,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -18080,11 +18062,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -18194,11 +18176,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -18308,11 +18290,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -18422,11 +18404,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -18536,11 +18518,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -18650,11 +18632,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -18764,11 +18746,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -18878,11 +18860,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -18992,11 +18974,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -19106,11 +19088,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -19220,11 +19202,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -19334,11 +19316,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -19448,11 +19430,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -19562,11 +19544,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -19676,11 +19658,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -19790,11 +19772,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -19904,11 +19886,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -20018,11 +20000,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -20132,11 +20114,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -20246,11 +20228,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -20360,11 +20342,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -20474,11 +20456,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -20491,14 +20473,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -20930,14 +20909,11 @@ func (m *OneofProtoTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -21369,14 +21345,11 @@ func (m *OneofStdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/types/combos/unmarshaler/types.pb.go b/test/types/combos/unmarshaler/types.pb.go
index 29e89a7e..103e448b 100644
--- a/test/types/combos/unmarshaler/types.pb.go
+++ b/test/types/combos/unmarshaler/types.pb.go
@@ -9112,14 +9112,11 @@ func (m *KnownTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -9925,14 +9922,11 @@ func (m *ProtoTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -10738,14 +10732,11 @@ func (m *StdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -11540,14 +11531,11 @@ func (m *RepProtoTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -12342,14 +12330,11 @@ func (m *RepStdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -12494,11 +12479,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -12609,11 +12594,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -12724,11 +12709,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -12839,11 +12824,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -12954,11 +12939,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13069,11 +13054,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13184,11 +13169,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13299,11 +13284,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13414,11 +13399,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13529,11 +13514,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13644,11 +13629,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13759,11 +13744,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13874,11 +13859,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -13989,11 +13974,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14104,11 +14089,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14219,11 +14204,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14334,11 +14319,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14449,11 +14434,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14564,11 +14549,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14679,11 +14664,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14794,11 +14779,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14909,11 +14894,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -14926,14 +14911,11 @@ func (m *MapProtoTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -15077,11 +15059,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15191,11 +15173,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15305,11 +15287,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15419,11 +15401,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15533,11 +15515,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15647,11 +15629,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15761,11 +15743,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15875,11 +15857,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -15989,11 +15971,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16103,11 +16085,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16217,11 +16199,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16331,11 +16313,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16445,11 +16427,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16559,11 +16541,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16673,11 +16655,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16787,11 +16769,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -16901,11 +16883,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17015,11 +16997,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17129,11 +17111,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17243,11 +17225,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17357,11 +17339,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17471,11 +17453,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipTypes(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthTypes
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -17488,14 +17470,11 @@ func (m *MapStdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -17927,14 +17906,11 @@ func (m *OneofProtoTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -18366,14 +18342,11 @@ func (m *OneofStdTypes) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/unmarshalmerge/unmarshalmerge.pb.go b/test/unmarshalmerge/unmarshalmerge.pb.go
index 84db558e..b89044fd 100644
--- a/test/unmarshalmerge/unmarshalmerge.pb.go
+++ b/test/unmarshalmerge/unmarshalmerge.pb.go
@@ -1052,14 +1052,11 @@ func (m *Big) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnmarshalmerge(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnmarshalmerge
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnmarshalmerge
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1162,14 +1159,11 @@ func (m *BigUnsafe) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnmarshalmerge(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnmarshalmerge
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnmarshalmerge
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1236,14 +1230,11 @@ func (m *Sub) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnmarshalmerge(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnmarshalmerge
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnmarshalmerge
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1473,14 +1464,11 @@ func (m *IntMerge) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnmarshalmerge(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnmarshalmerge
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnmarshalmerge
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/unrecognized/unrecognized.pb.go b/test/unrecognized/unrecognized.pb.go
index 0029b38f..07c44305 100644
--- a/test/unrecognized/unrecognized.pb.go
+++ b/test/unrecognized/unrecognized.pb.go
@@ -3271,14 +3271,11 @@ func (m *A) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3432,14 +3429,11 @@ func (m *B) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3506,14 +3500,11 @@ func (m *D) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3723,14 +3714,11 @@ func (m *C) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3851,14 +3839,11 @@ func (m *U) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3958,14 +3943,11 @@ func (m *OldA) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -4083,14 +4065,11 @@ func (m *OldB) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -4276,14 +4255,11 @@ func (m *OldC) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -4417,14 +4393,11 @@ func (m *OldU) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognized(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognized
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognized
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/test/unrecognizedgroup/unrecognizedgroup.pb.go b/test/unrecognizedgroup/unrecognizedgroup.pb.go
index 34505957..b018f241 100644
--- a/test/unrecognizedgroup/unrecognizedgroup.pb.go
+++ b/test/unrecognizedgroup/unrecognizedgroup.pb.go
@@ -1649,14 +1649,11 @@ func (m *NewNoGroup) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognizedgroup(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognizedgroup
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognizedgroup
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1723,14 +1720,11 @@ func (m *A) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipUnrecognizedgroup(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthUnrecognizedgroup
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthUnrecognizedgroup
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/any.pb.go b/types/any.pb.go
index 98e269d5..e3d4d949 100644
--- a/types/any.pb.go
+++ b/types/any.pb.go
@@ -590,14 +590,11 @@ func (m *Any) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipAny(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthAny
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthAny
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/api.pb.go b/types/api.pb.go
index 58bf4b53..83e88692 100644
--- a/types/api.pb.go
+++ b/types/api.pb.go
@@ -1675,14 +1675,11 @@ func (m *Api) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipApi(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthApi
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthApi
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -1918,14 +1915,11 @@ func (m *Method) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipApi(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthApi
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthApi
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2036,14 +2030,11 @@ func (m *Mixin) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipApi(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthApi
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthApi
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/duration.pb.go b/types/duration.pb.go
index 3959f066..4deafcb1 100644
--- a/types/duration.pb.go
+++ b/types/duration.pb.go
@@ -413,14 +413,11 @@ func (m *Duration) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipDuration(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthDuration
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthDuration
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/empty.pb.go b/types/empty.pb.go
index 17e3aa55..9e94748b 100644
--- a/types/empty.pb.go
+++ b/types/empty.pb.go
@@ -358,14 +358,11 @@ func (m *Empty) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipEmpty(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthEmpty
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthEmpty
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/field_mask.pb.go b/types/field_mask.pb.go
index 7226b57f..6ae346d9 100644
--- a/types/field_mask.pb.go
+++ b/types/field_mask.pb.go
@@ -634,14 +634,11 @@ func (m *FieldMask) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipFieldMask(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthFieldMask
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthFieldMask
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/source_context.pb.go b/types/source_context.pb.go
index 61045ce1..8e6ce71b 100644
--- a/types/source_context.pb.go
+++ b/types/source_context.pb.go
@@ -420,14 +420,11 @@ func (m *SourceContext) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipSourceContext(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthSourceContext
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthSourceContext
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/struct.pb.go b/types/struct.pb.go
index cea553ee..c0457312 100644
--- a/types/struct.pb.go
+++ b/types/struct.pb.go
@@ -1860,11 +1860,11 @@ func (m *Struct) Unmarshal(dAtA []byte) error {
 					iNdEx = entryPreIndex
 					skippy, err := skipStruct(dAtA[iNdEx:])
 					if err != nil {
 						return err
 					}
-					if skippy < 0 {
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
 						return ErrInvalidLengthStruct
 					}
 					if (iNdEx + skippy) > postIndex {
 						return io.ErrUnexpectedEOF
 					}
@@ -1877,14 +1877,11 @@ func (m *Struct) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipStruct(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthStruct
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthStruct
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2085,14 +2082,11 @@ func (m *Value) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipStruct(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthStruct
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthStruct
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2173,14 +2167,11 @@ func (m *ListValue) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipStruct(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthStruct
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthStruct
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/timestamp.pb.go b/types/timestamp.pb.go
index b8187526..45db7b3b 100644
--- a/types/timestamp.pb.go
+++ b/types/timestamp.pb.go
@@ -435,14 +435,11 @@ func (m *Timestamp) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipTimestamp(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthTimestamp
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthTimestamp
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/type.pb.go b/types/type.pb.go
index 13b7ec02..791427bb 100644
--- a/types/type.pb.go
+++ b/types/type.pb.go
@@ -2481,14 +2481,11 @@ func (m *Type) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipType(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthType
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthType
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2793,14 +2790,11 @@ func (m *Field) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipType(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthType
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthType
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3002,14 +2996,11 @@ func (m *Enum) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipType(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthType
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthType
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3141,14 +3132,11 @@ func (m *EnumValue) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipType(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthType
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthType
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -3263,14 +3251,11 @@ func (m *Option) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipType(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthType
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthType
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/types/wrappers.pb.go b/types/wrappers.pb.go
index 8f1edb57..8d415420 100644
--- a/types/wrappers.pb.go
+++ b/types/wrappers.pb.go
@@ -2018,14 +2018,11 @@ func (m *DoubleValue) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2083,14 +2080,11 @@ func (m *FloatValue) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2156,14 +2150,11 @@ func (m *Int64Value) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2229,14 +2220,11 @@ func (m *UInt64Value) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2302,14 +2290,11 @@ func (m *Int32Value) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2375,14 +2360,11 @@ func (m *UInt32Value) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2449,14 +2431,11 @@ func (m *BoolValue) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2535,14 +2514,11 @@ func (m *StringValue) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -2623,14 +2599,11 @@ func (m *BytesValue) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipWrappers(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthWrappers
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthWrappers
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/fast/gogovanity.pb.go b/vanity/test/fast/gogovanity.pb.go
index 2a2924a8..6c08c10b 100644
--- a/vanity/test/fast/gogovanity.pb.go
+++ b/vanity/test/fast/gogovanity.pb.go
@@ -297,14 +297,11 @@ func (m *B) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipGogovanity(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthGogovanity
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthGogovanity
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/fast/proto3.pb.go b/vanity/test/fast/proto3.pb.go
index 7d9f6b5d..3643b6fe 100644
--- a/vanity/test/fast/proto3.pb.go
+++ b/vanity/test/fast/proto3.pb.go
@@ -217,14 +217,11 @@ func (m *Aproto3) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipProto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthProto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/fast/vanity.pb.go b/vanity/test/fast/vanity.pb.go
index 34b6e80e..ad09c9c3 100644
--- a/vanity/test/fast/vanity.pb.go
+++ b/vanity/test/fast/vanity.pb.go
@@ -260,14 +260,11 @@ func (m *A) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipVanity(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthVanity
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthVanity
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/faster/gogovanity.pb.go b/vanity/test/faster/gogovanity.pb.go
index a00e4163..ef689dd7 100644
--- a/vanity/test/faster/gogovanity.pb.go
+++ b/vanity/test/faster/gogovanity.pb.go
@@ -283,14 +283,11 @@ func (m *B) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipGogovanity(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthGogovanity
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthGogovanity
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/faster/proto3.pb.go b/vanity/test/faster/proto3.pb.go
index 4b6a0d8e..83c5a460 100644
--- a/vanity/test/faster/proto3.pb.go
+++ b/vanity/test/faster/proto3.pb.go
@@ -207,14 +207,11 @@ func (m *Aproto3) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipProto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthProto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/faster/vanity.pb.go b/vanity/test/faster/vanity.pb.go
index 5380e225..05396178 100644
--- a/vanity/test/faster/vanity.pb.go
+++ b/vanity/test/faster/vanity.pb.go
@@ -239,14 +239,11 @@ func (m *A) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipVanity(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthVanity
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthVanity
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/slick/gogovanity.pb.go b/vanity/test/slick/gogovanity.pb.go
index bf5915fb..8849f3f9 100644
--- a/vanity/test/slick/gogovanity.pb.go
+++ b/vanity/test/slick/gogovanity.pb.go
@@ -372,14 +372,11 @@ func (m *B) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipGogovanity(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthGogovanity
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthGogovanity
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/slick/proto3.pb.go b/vanity/test/slick/proto3.pb.go
index e8b034c7..4326b393 100644
--- a/vanity/test/slick/proto3.pb.go
+++ b/vanity/test/slick/proto3.pb.go
@@ -270,14 +270,11 @@ func (m *Aproto3) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipProto3(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthProto3
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProto3
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
diff --git a/vanity/test/slick/vanity.pb.go b/vanity/test/slick/vanity.pb.go
index 88b55bf4..8b4c015a 100644
--- a/vanity/test/slick/vanity.pb.go
+++ b/vanity/test/slick/vanity.pb.go
@@ -307,14 +307,11 @@ func (m *A) Unmarshal(dAtA []byte) error {
 			iNdEx = preIndex
 			skippy, err := skipVanity(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthVanity
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthVanity
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}

Vulnerable code: 			p.P(`if skippy < 0 {`)
			p.P(`if skippy < 0 {`)
			p.In()
			p.P(`return ErrInvalidLength`, p.localName)
			p.Out()
			p.P(`}`)
			p.P(`if (iNdEx + skippy) < 0 {`)
		p.P(`if skippy < 0 {`)
		p.In()
		p.P(`return ErrInvalidLength`, p.localName)
		p.Out()
		p.P(`}`)
		p.P(`if (iNdEx + skippy) < 0 {`)
			if skippy < 0 {
				return ErrInvalidLengthAsym
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthAsym
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthCasttype
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthCasttype
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthCasttype
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthCasttype
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthCastvalue
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthCastvalue
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthCastvalue
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthCastvalue
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthThetest
				}
				if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthThetest
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthProto
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthData
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthEmpty
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthEnumdecl
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthEnumdeclall
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthExample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthExample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthExample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthExample
			}
			if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthExample
				}
				if (iNdEx + skippy) < 0 {
				if skippy < 0 {
					return ErrInvalidLengthExample
				}
				if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthExample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthExample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthFuzz
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthFuzz
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthFuzz
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthFuzz
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthA
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthC
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIndex
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIndeximport
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthObject
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue260
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue260
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue260
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue261
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTimefail
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue322
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue330
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthProto
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthProto
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue42
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue42
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue449
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue498
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue503
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue530
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue617
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthIssue617
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthProto
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMap
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMap
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMap
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMap
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMap
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMap
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMapsproto2
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMapsproto2
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMapsproto2
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMapsproto2
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMapsproto2
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMapsproto2
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMapsproto2
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthMapsproto2
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthNopackage
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthOne
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthPacked
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthPacked
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthPacked
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthPacked
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthProtosize
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthRequiredexample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthRequiredexample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthRequiredexample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthRequiredexample
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthSizeunderscore
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTheproto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypedecl
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypedecl
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypedecl
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypedeclall
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypedeclall
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypedeclall
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTypes
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnmarshalmerge
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnmarshalmerge
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnmarshalmerge
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnmarshalmerge
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognized
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognizedgroup
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthUnrecognizedgroup
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthAny
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthApi
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthApi
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthApi
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthDuration
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthEmpty
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthFieldMask
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthSourceContext
			}
			if (iNdEx + skippy) < 0 {
					if skippy < 0 {
			if skippy < 0 {
				return ErrInvalidLengthStruct
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthStruct
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthStruct
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthTimestamp
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthType
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthType
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthType
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthType
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthType
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthWrappers
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthGogovanity
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthProto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthVanity
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthGogovanity
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthProto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthVanity
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthGogovanity
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthProto3
			}
			if (iNdEx + skippy) < 0 {
			if skippy < 0 {
				return ErrInvalidLengthVanity
			}
			if (iNdEx + skippy) < 0 {
Fixed code: 			p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`)
			p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`)
		p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`)
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
				if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
					if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {
			if (skippy < 0) || (iNdEx+skippy) < 0 {