Fix copyPacketWaitWithPool

nekohasekai · nekohasekai · commit ed2d05ab518a · 2023-04-27T23:17:30.000+08:00
diff --git a/common/bufio/copy.go b/common/bufio/copy.go
@@ -71,7 +71,7 @@ func CopyExtended(originDestination io.Writer, destination N.ExtendedWriter, sou
 			return
 		}
 	}
-	if N.IsUnsafeWriter(destination) {
+	if !common.UnsafeBuffer || N.IsUnsafeWriter(destination) {
 		return CopyExtendedWithPool(originDestination, destination, source, readCounters, writeCounters)
 	}
 	bufferSize := N.CalculateMTU(source, destination)
diff --git a/common/bufio/copy_direct_posix.go b/common/bufio/copy_direct_posix.go
@@ -113,6 +113,8 @@ func copyPacketWaitWithPool(destinationConn N.PacketWriter, source N.PacketReadW
 		if err != nil {
 			buffer.Release()
 			return
+		} else {
+			buffer = nil
 		}
 		n += int64(dataLen)
 		for _, counter := range readCounters {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func CopyExtended(originDestination io.Writer, destination N.ExtendedWriter, sou`
`71`	`71`	`return`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`- if N.IsUnsafeWriter(destination) {`
	`74`	`+ if !common.UnsafeBuffer \|\| N.IsUnsafeWriter(destination) {`
`75`	`75`	`return CopyExtendedWithPool(originDestination, destination, source, readCounters, writeCounters)`
`76`	`76`	`}`
`77`	`77`	`bufferSize := N.CalculateMTU(source, destination)`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,8 @@ func copyPacketWaitWithPool(destinationConn N.PacketWriter, source N.PacketReadW`
`113`	`113`	`if err != nil {`
`114`	`114`	`buffer.Release()`
`115`	`115`	`return`
	`116`	`+ } else {`
	`117`	`+ buffer = nil`
`116`	`118`	`}`
`117`	`119`	`n += int64(dataLen)`
`118`	`120`	`for _, counter := range readCounters {`