correctly set commit and diff

trufflesecurity · Feb 9, 2024 · 3962c61 · 3962c61
1 parent 1475990
commit 3962c61
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/gitparse/gitparse.go b/pkg/gitparse/gitparse.go
@@ -380,7 +380,7 @@ func (c *Parser) FromReader(ctx context.Context, stdOut io.Reader, diffChan chan
 			latestState = CommitLine
 
 			// If there is a currentDiff, add it to currentCommit.
-			if currentDiff.Commit.Hash != "" || currentDiff.IsBinary {
+			if currentDiff.Commit != nil && currentDiff.Commit.Hash != "" || currentDiff.IsBinary {
 				if err := currentDiff.finalize(); err != nil {
 					ctx.Logger().Error(
 						err,
@@ -433,9 +433,6 @@ func (c *Parser) FromReader(ctx context.Context, stdOut io.Reader, diffChan chan
 			latestState = DiffLine
 
 			// This should never be nil, but check in case the stdin stream is messed up.
-			if currentCommit == nil {
-				currentCommit = &Commit{}
-			}
 			if currentDiff.Commit.Hash != "" || currentDiff.IsBinary {
 				if err := currentDiff.finalize(); err != nil {
 					ctx.Logger().Error(err,
@@ -448,6 +445,9 @@ func (c *Parser) FromReader(ctx context.Context, stdOut io.Reader, diffChan chan
 				}
 				diffChan <- currentDiff
 			}
+			if currentCommit == nil {
+				currentCommit = &Commit{}
+			}
 			currentDiff = diff(currentCommit)
 		case isModeLine(latestState, line):
 			latestState = ModeLine