Merge remote-tracking branch 'origin/rel/stable' into relstable3.11.3-remerge

Algo-devops-service · Algo-devops-service · commit 31e8c03d5162 · 2022-11-17T09:52:18.000-05:00
diff --git a/network/topics.go b/network/topics.go
@@ -108,7 +108,7 @@ func UnmarshallTopics(buffer []byte) (ts Topics, err error) {
 
 		// read the data length
 		dataLen, nr := binary.Uvarint(buffer[idx:])
-		if nr <= 0 {
+		if nr <= 0 || dataLen > maxMessageLength {
 			return nil, fmt.Errorf("UnmarshallTopics: could not read the data length")
 		}
 		idx += nr

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func UnmarshallTopics(buffer []byte) (ts Topics, err error) {`
`108`	`108`
`109`	`109`	`// read the data length`
`110`	`110`	`dataLen, nr := binary.Uvarint(buffer[idx:])`
`111`		`- if nr <= 0 {`
	`111`	`+ if nr <= 0 \|\| dataLen > maxMessageLength {`
`112`	`112`	`return nil, fmt.Errorf("UnmarshallTopics: could not read the data length")`
`113`	`113`	`}`
`114`	`114`	`idx += nr`