File history walk: memory management

ianhattendorf · ianhattendorf · commit 24cb2bfbb0f8 · 2019-05-20T10:21:42.000-07:00
diff --git a/generate/templates/manual/revwalk/file_history_walk.cc b/generate/templates/manual/revwalk/file_history_walk.cc
@@ -352,10 +352,10 @@ void GitRevwalk::FileHistoryWalkWorker::Execute()
       }
 
       delete fileHistoryEvent;
+      git_commit_free(parentCommit);
+      git_tree_free(parentTree);
 
-      if (firstMatchingParentIndex.first) {
-        git_commit_free(parentCommit);
-        git_tree_free(parentTree);
+     if (firstMatchingParentIndex.first) {
         break;
       }
     }
@@ -414,6 +414,8 @@ void GitRevwalk::FileHistoryWalkWorker::Execute()
     baton->out = NULL;
     baton->error = git_error_dup(git_error_last());
   }
+  free((void *)baton->file_path);
+  baton->file_path = NULL;
 }
 
 void GitRevwalk::FileHistoryWalkWorker::HandleOKCallback()

Original file line number	Diff line number	Diff line change
`@@ -352,10 +352,10 @@ void GitRevwalk::FileHistoryWalkWorker::Execute()`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`delete fileHistoryEvent;`
	`355`	`+ git_commit_free(parentCommit);`
	`356`	`+ git_tree_free(parentTree);`
`355`	`357`
`356`		`- if (firstMatchingParentIndex.first) {`
`357`		`- git_commit_free(parentCommit);`
`358`		`- git_tree_free(parentTree);`
	`358`	`+ if (firstMatchingParentIndex.first) {`
`359`	`359`	`break;`
`360`	`360`	`}`
`361`	`361`	`}`
`@@ -414,6 +414,8 @@ void GitRevwalk::FileHistoryWalkWorker::Execute()`
`414`	`414`	`baton->out = NULL;`
`415`	`415`	`baton->error = git_error_dup(git_error_last());`
`416`	`416`	`}`
	`417`	`+ free((void *)baton->file_path);`
	`418`	`+ baton->file_path = NULL;`
`417`	`419`	`}`
`418`	`420`
`419`	`421`	`void GitRevwalk::FileHistoryWalkWorker::HandleOKCallback()`