Merge pull request nodegit#1996 from zawata/fix/OtherDifferentDoubleFree

ianhattendorf · web-flow · commit 84a86ebe5767 · 2024-04-19T10:12:38.000-07:00
Fix double-free introduced trying to fix other double-free
diff --git a/generate/templates/manual/repository/get_references.cc b/generate/templates/manual/repository/get_references.cc
@@ -79,6 +79,8 @@ void GitRepository::GetReferencesWorker::Execute()
       baton->out->push_back(reference);
     }
   }
+
+  git_strarray_free(&reference_names);
 }
 
 void GitRepository::GetReferencesWorker::HandleErrorCallback() {
diff --git a/generate/templates/manual/repository/get_remotes.cc b/generate/templates/manual/repository/get_remotes.cc
@@ -29,11 +29,7 @@ void GitRepository::GetRemotesWorker::Execute()
 {
   giterr_clear();
 
-  git_repository *repo;
-  {
-    nodegit::LockMaster lockMaster(true, baton->repo);
-    baton->error_code = git_repository_open(&repo, git_repository_workdir(baton->repo));
-  }
+  git_repository *repo = baton->repo;
 
   if (baton->error_code != GIT_OK) {
     if (giterr_last() != NULL) {
@@ -52,7 +48,6 @@ void GitRepository::GetRemotesWorker::Execute()
       baton->error = git_error_dup(giterr_last());
     }
 
-    git_repository_free(repo);
     delete baton->out;
     baton->out = NULL;
     return;
@@ -76,7 +71,6 @@ void GitRepository::GetRemotesWorker::Execute()
       }
 
       git_strarray_free(&remote_names);
-      git_repository_free(repo);
       delete baton->out;
       baton->out = NULL;
       return;
@@ -86,7 +80,6 @@ void GitRepository::GetRemotesWorker::Execute()
   }
 
   git_strarray_free(&remote_names);
-  git_repository_free(repo);
 }
 
 void GitRepository::GetRemotesWorker::HandleErrorCallback() {

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ void GitRepository::GetReferencesWorker::Execute()`
`79`	`79`	`baton->out->push_back(reference);`
`80`	`80`	`}`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ git_strarray_free(&reference_names);`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`void GitRepository::GetReferencesWorker::HandleErrorCallback() {`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,7 @@ void GitRepository::GetRemotesWorker::Execute()`
`29`	`29`	`{`
`30`	`30`	`giterr_clear();`
`31`	`31`
`32`		`- git_repository *repo;`
`33`		`- {`
`34`		`- nodegit::LockMaster lockMaster(true, baton->repo);`
`35`		`- baton->error_code = git_repository_open(&repo, git_repository_workdir(baton->repo));`
`36`		`- }`
	`32`	`+ git_repository *repo = baton->repo;`
`37`	`33`
`38`	`34`	`if (baton->error_code != GIT_OK) {`
`39`	`35`	`if (giterr_last() != NULL) {`
`@@ -52,7 +48,6 @@ void GitRepository::GetRemotesWorker::Execute()`
`52`	`48`	`baton->error = git_error_dup(giterr_last());`
`53`	`49`	`}`
`54`	`50`
`55`		`- git_repository_free(repo);`
`56`	`51`	`delete baton->out;`
`57`	`52`	`baton->out = NULL;`
`58`	`53`	`return;`
`@@ -76,7 +71,6 @@ void GitRepository::GetRemotesWorker::Execute()`
`76`	`71`	`}`
`77`	`72`
`78`	`73`	`git_strarray_free(&remote_names);`
`79`		`- git_repository_free(repo);`
`80`	`74`	`delete baton->out;`
`81`	`75`	`baton->out = NULL;`
`82`	`76`	`return;`
`@@ -86,7 +80,6 @@ void GitRepository::GetRemotesWorker::Execute()`
`86`	`80`	`}`
`87`	`81`
`88`	`82`	`git_strarray_free(&remote_names);`
`89`		`- git_repository_free(repo);`
`90`	`83`	`}`
`91`	`84`
`92`	`85`	`void GitRepository::GetRemotesWorker::HandleErrorCallback() {`