Commit 4505a42a23cfb55fcfd88d89d150686a78636805

Edward Thomson 2016-05-26T12:42:43

rebase: change assertion to avoid It looks like we're getting the operation and not doing anything with it, when in fact we are asserting that it's not null. Simply assert that we are within the operation boundary instead of using the `git_array_get` macro to do this for us.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/src/rebase.c b/src/rebase.c
index 9f3b6ec..470e62a 100644
--- a/src/rebase.c
+++ b/src/rebase.c
@@ -1047,15 +1047,12 @@ static int rebase_commit_inmemory(
 	const char *message_encoding,
 	const char *message)
 {
-	git_rebase_operation *operation;
 	git_commit *commit = NULL;
 	int error = 0;
 
-	operation = git_array_get(rebase->operations, rebase->current);
-
-	assert(operation);
 	assert(rebase->index);
 	assert(rebase->last_commit);
+	assert(rebase->current < rebase->operations.size);
 
 	if ((error = rebase_commit__create(&commit, rebase, rebase->index,
 		rebase->last_commit, author, committer, message_encoding, message)) < 0)