From 2e26e5591b477a05577de7f5f73b442a016b4ea9 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 29 Mar 2025 22:21:41 +0800 Subject: Fix out of bounds read on finding merge bases --- http_handle_repo_contrib_one.go | 7 +++++++ 1 file changed, 7 insertions(+) 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 -- cgit v1.2.3