Merge pull request #462 from dleehr/fix-tag-enumeration-crash

joshaber · joshaber · commit 5373acff92dc · 2015-06-02T11:55:21.000-04:00
Avoid calling tag enumerator block if lookup returns nil tag
diff --git a/ObjectiveGit/GTRepository.m b/ObjectiveGit/GTRepository.m
@@ -457,7 +457,9 @@ static int GTRepositoryForeachTagCallback(const char *name, git_oid *oid, void *
 	GTTag *tag = (GTTag *)[info->myself lookUpObjectByGitOid:oid objectType:GTObjectTypeTag error:NULL];
 
 	BOOL stop = NO;
-	info->block(tag, &stop);
+	if (tag != nil) {
+		info->block(tag, &stop);
+	}
 
 	return stop ? GIT_EUSER : 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,9 @@ static int GTRepositoryForeachTagCallback(const char name, git_oid oid, void *`
`457`	`457`	`GTTag tag = (GTTag )[info->myself lookUpObjectByGitOid:oid objectType:GTObjectTypeTag error:NULL];`
`458`	`458`
`459`	`459`	`BOOL stop = NO;`
`460`		`- info->block(tag, &stop);`
	`460`	`+ if (tag != nil) {`
	`461`	`+ info->block(tag, &stop);`
	`462`	`+ }`
`461`	`463`
`462`	`464`	`return stop ? GIT_EUSER : 0;`
`463`	`465`	`}`