Merge pull request #425 from illia-li/il/fix/framer/read_inet_adress

dkropachev · web-flow · commit 7832e4b80836 · 2025-04-13T09:25:39.000-04:00
&lt;framer&gt; `readInetAdressOnly()` fix buffer len check
diff --git a/frame.go b/frame.go
@@ -1938,14 +1938,14 @@ func (f *framer) readInetAdressOnly() net.IP {
 		panic(fmt.Errorf("invalid IP size: %d", size))
 	}
 
-	if len(f.buf) < 1 {
+	if len(f.buf) < int(size) {
 		panic(fmt.Errorf("not enough bytes in buffer to read inet require %d got: %d", size, len(f.buf)))
 	}
 
-	ip := make([]byte, size)
+	ip := make(net.IP, size)
 	copy(ip, f.buf[:size])
 	f.buf = f.buf[size:]
-	return net.IP(ip)
+	return ip
 }
 
 func (f *framer) readInet() (net.IP, int) {

Original file line number	Diff line number	Diff line change
`@@ -1938,14 +1938,14 @@ func (f *framer) readInetAdressOnly() net.IP {`
`1938`	`1938`	`panic(fmt.Errorf("invalid IP size: %d", size))`
`1939`	`1939`	`}`
`1940`	`1940`
`1941`		`- if len(f.buf) < 1 {`
	`1941`	`+ if len(f.buf) < int(size) {`
`1942`	`1942`	`panic(fmt.Errorf("not enough bytes in buffer to read inet require %d got: %d", size, len(f.buf)))`
`1943`	`1943`	`}`
`1944`	`1944`
`1945`		`- ip := make([]byte, size)`
	`1945`	`+ ip := make(net.IP, size)`
`1946`	`1946`	`copy(ip, f.buf[:size])`
`1947`	`1947`	`f.buf = f.buf[size:]`
`1948`		`- return net.IP(ip)`
	`1948`	`+ return ip`
`1949`	`1949`	`}`
`1950`	`1950`
`1951`	`1951`	`func (f *framer) readInet() (net.IP, int) {`