diff options
| author | Runxi Yu <me@runxiyu.org> | 2025-03-29 22:21:41 +0800 |
|---|---|---|
| committer | Runxi Yu <me@runxiyu.org> | 2025-03-29 22:22:32 +0800 |
| commit | 2e26e5591b477a05577de7f5f73b442a016b4ea9 (patch) | |
| tree | 3ea6f862a6023ff71882cd3a17300099a878ae8e | |
| parent | Fix merge request index (diff) | |
| download | forge-2e26e5591b477a05577de7f5f73b442a016b4ea9.tar.gz forge-2e26e5591b477a05577de7f5f73b442a016b4ea9.tar.zst forge-2e26e5591b477a05577de7f5f73b442a016b4ea9.zip | |
Fix out of bounds read on finding merge basesv0.1.3
| -rw-r--r-- | http_handle_repo_contrib_one.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/http_handle_repo_contrib_one.go b/http_handle_repo_contrib_one.go index 134f50b..0df2e45 100644 --- a/http_handle_repo_contrib_one.go +++ b/http_handle_repo_contrib_one.go @@ -72,6 +72,13 @@ func httpHandleRepoContribOne(writer http.ResponseWriter, request *http.Request, errorPage500(writer, params, "Error getting merge base: "+err.Error()) return } + + if len(mergeBases) < 1 { + errorPage500(writer, params, "No merge base found for this merge request; these two branches do not share any common history") + // TODO + return + } + mergeBaseCommit = mergeBases[0] params["merge_base"] = mergeBaseCommit |