mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 11:28:24 +00:00 
			
		
		
		
	Prevent context deadline error propagation in GetCommitsInfo (#20346)
* Prevent context deadline error propagation in GetCommitsInfo Although `WalkGitLog` tries to test for `context.DeadlineExceededErr` there is a small chance that the error will propagate to the reader before it is recognised. This will cause the error to propagate up to `renderDirectoryFiles` and cause a http status 500. Here we check that the error passed is a `DeadlineExceededErr` via error.Is Fix #20329 Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
		| @@ -8,6 +8,7 @@ import ( | ||||
| 	"bufio" | ||||
| 	"bytes" | ||||
| 	"context" | ||||
| 	"errors" | ||||
| 	"io" | ||||
| 	"path" | ||||
| 	"sort" | ||||
| @@ -62,9 +63,10 @@ func LogNameStatusRepo(ctx context.Context, repository, head, treepath string, p | ||||
| 		}) | ||||
| 		if err != nil { | ||||
| 			_ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String())) | ||||
| 		} else { | ||||
| 			_ = stdoutWriter.Close() | ||||
| 			return | ||||
| 		} | ||||
|  | ||||
| 		_ = stdoutWriter.Close() | ||||
| 	}() | ||||
|  | ||||
| 	// For simplicities sake we'll us a buffered reader to read from the cat-file --batch | ||||
| @@ -354,7 +356,7 @@ heaploop: | ||||
| 		} | ||||
| 		current, err := g.Next(treepath, path2idx, changed, maxpathlen) | ||||
| 		if err != nil { | ||||
| 			if err == context.DeadlineExceeded { | ||||
| 			if errors.Is(err, context.DeadlineExceeded) { | ||||
| 				break heaploop | ||||
| 			} | ||||
| 			g.Close() | ||||
|   | ||||
		Reference in New Issue
	
	Block a user