fix: crypt: file already closed; net: concurrent download deadlock

j2rong4cn · j2rong4cn · commit 6d0d3ac61233 · 2025-06-30T01:49:27.000+08:00
diff --git a/drivers/crypt/meta.go b/drivers/crypt/meta.go
@@ -28,7 +28,7 @@ type Addition struct {
 var config = driver.Config{
 	Name:              "Crypt",
 	LocalSort:         true,
-	OnlyLocal:         false,
+	OnlyLocal:         true,
 	OnlyProxy:         true,
 	NoCache:           true,
 	NoUpload:          false,
diff --git a/internal/net/request.go b/internal/net/request.go
@@ -663,15 +663,15 @@ func (br *Buf) Read(p []byte) (n int, err error) {
 		} else {
 			err = io.ErrClosedPipe
 		}
-		br.rw.Unlock()
 		if err != nil && err != io.EOF {
+			br.rw.Unlock()
 			return
 		}
 		if n > 0 {
 			br.off += n
+			br.rw.Unlock()
 			return n, nil
 		}
-		br.rw.Lock()
 		br.readPending = true
 		br.rw.Unlock()
 		// n==0, err==io.EOF

Original file line number	Diff line number	Diff line change
`@@ -663,15 +663,15 @@ func (br *Buf) Read(p []byte) (n int, err error) {`
`663`	`663`	`} else {`
`664`	`664`	`err = io.ErrClosedPipe`
`665`	`665`	`}`
`666`		`- br.rw.Unlock()`
`667`	`666`	`if err != nil && err != io.EOF {`
	`667`	`+ br.rw.Unlock()`
`668`	`668`	`return`
`669`	`669`	`}`
`670`	`670`	`if n > 0 {`
`671`	`671`	`br.off += n`
	`672`	`+ br.rw.Unlock()`
`672`	`673`	`return n, nil`
`673`	`674`	`}`
`674`		`- br.rw.Lock()`
`675`	`675`	`br.readPending = true`
`676`	`676`	`br.rw.Unlock()`
`677`	`677`	`// n==0, err==io.EOF`