Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix nil dereference on error (#30740) (#30746)

Browse source 
Backport #30740 manually

Co-authored-by: Chongyi Zheng <git@zcy.dev>
(cherry picked from commit d07019f539c475466748fbf730d7f270a92fdb8b)
This commit is contained in:
wxiaoguang 2024-04-29 08:23:35 +08:00 committed by Earl Warren
parent 16e7af48bd
commit 78517f80bb
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
routers/api/actions/artifacts.go
View file

@ -467,14 +467,15 @@ func (ar artifactRoutes) downloadArtifact(ctx *ArtifactContext) {
log.Error("Error getting artifact: %v", err) log.Error("Error getting artifact: %v", err)
ctx.Error(http.StatusInternalServerError, err.Error()) ctx.Error(http.StatusInternalServerError, err.Error())
return return
} else if !exist { }
if !exist {
log.Error("artifact with ID %d does not exist", artifactID) log.Error("artifact with ID %d does not exist", artifactID)
ctx.Error(http.StatusNotFound, fmt.Sprintf("artifact with ID %d does not exist", artifactID)) ctx.Error(http.StatusNotFound, fmt.Sprintf("artifact with ID %d does not exist", artifactID))
return return
} }
if artifact.RunID != runID { if artifact.RunID != runID {
log.Error("Error dismatch runID and artifactID, task: %v, artifact: %v", runID, artifactID) log.Error("Error mismatch runID and artifactID, task: %v, artifact: %v", runID, artifactID)
ctx.Error(http.StatusBadRequest, err.Error()) ctx.Error(http.StatusBadRequest)
return return
} }

2
routers/web/repo/actions/view.go
View file

@ -552,7 +552,7 @@ func getRunJobs(ctx *context_module.Context, runIndex, jobIndex int64) (*actions
return nil, nil return nil, nil
} }
if len(jobs) == 0 { if len(jobs) == 0 {
ctx.Error(http.StatusNotFound, err.Error()) ctx.Error(http.StatusNotFound)
return nil, nil return nil, nil
} }