other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 20:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that 0 <= b.start <= b.end 

Fixes https://github.com/XTLS/Xray-core/issues/1501
This commit is contained in:
RPRX 2023-01-09 08:51:51 +00:00 committed by GitHub
parent ed960cc885
commit 7b8ff01114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/buf/buffer.go
View File

@ -160,6 +160,19 @@ func (b *Buffer) BytesTo(to int32) []byte {
return b.v[b.start : b.start+to] return b.v[b.start : b.start+to]
} }
// Check makes sure that 0 <= b.start <= b.end.
func (b *Buffer) Check() {
if b.start < 0 {
b.start = 0
}
if b.end < 0 {
b.end = 0
}
if b.start > b.end {
b.start = b.end
}
}
// Resize cuts the buffer at the given position. // Resize cuts the buffer at the given position.
func (b *Buffer) Resize(from, to int32) { func (b *Buffer) Resize(from, to int32) {
if from < 0 { if from < 0 {
@ -173,6 +186,7 @@ func (b *Buffer) Resize(from, to int32) {
} }
b.end = b.start + to b.end = b.start + to
b.start += from b.start += from
b.Check()
} }
// Advance cuts the buffer at the given position. // Advance cuts the buffer at the given position.
@ -181,6 +195,7 @@ func (b *Buffer) Advance(from int32) {
from += b.Len() from += b.Len()
} }
b.start += from b.start += from
b.Check()
} }
// Len returns the length of the buffer content. // Len returns the length of the buffer content.