From 6a39250579f240721d5d8b2eca017fa94126dc9d Mon Sep 17 00:00:00 2001
From: Mura Li <typeless@users.noreply.github.com>
Date: Fri, 31 Mar 2017 16:42:23 +0800
Subject: Add length check for the return string (#1420)

* Add length check for the return string

* Differentiate error paths and logging messages

* Rectify error message
---
 models/pull.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'models')

diff --git a/models/pull.go b/models/pull.go
index 822822411a..ababe79dd4 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -507,7 +507,9 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
 	mergeCommit, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git rev-list --ancestry-path --merges --reverse): %d", pr.BaseRepo.ID),
 		[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
 		"git", "rev-list", "--ancestry-path", "--merges", "--reverse", cmd)
-
+	if err == nil && len(mergeCommit) != 40 {
+		err = fmt.Errorf("unexpected length of output (got:%d bytes) '%s'", len(mergeCommit), mergeCommit)
+	}
 	if err != nil {
 		return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v %v", stderr, err)
 	}
-- 
cgit v1.2.3