Merge pull request nodegit#1995 from zawata/fix/dontFreeRepoOnRefError

ianhattendorf · web-flow · commit 3c73d24d7c3e · 2024-04-12T16:33:42.000-07:00
Don't free the given repo on error in getReferences and getRemotes
diff --git a/generate/templates/manual/repository/get_references.cc b/generate/templates/manual/repository/get_references.cc
@@ -61,7 +61,6 @@ void GitRepository::GetReferencesWorker::Execute()
       }
 
       git_strarray_free(&reference_names);
-      git_repository_free(repo);
       delete baton->out;
       baton->out = NULL;
       return;
diff --git a/generate/templates/manual/repository/get_remotes.cc b/generate/templates/manual/repository/get_remotes.cc
@@ -51,6 +51,8 @@ void GitRepository::GetRemotesWorker::Execute()
     if (giterr_last() != NULL) {
       baton->error = git_error_dup(giterr_last());
     }
+
+    git_repository_free(repo);
     delete baton->out;
     baton->out = NULL;
     return;
@@ -82,6 +84,9 @@ void GitRepository::GetRemotesWorker::Execute()
 
     baton->out->push_back(remote);
   }
+
+  git_strarray_free(&remote_names);
+  git_repository_free(repo);
 }
 
 void GitRepository::GetRemotesWorker::HandleErrorCallback() {
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -29,11 +29,13 @@ module.exports = function install() {
   }
 
   return new Promise(function(resolve, reject) {
+    const gypPath = path.join(__dirname, "..", "node_modules", "node-gyp", "bin", "node-gyp.js");
     var spawnedNodePreGyp = spawn(nodePreGyp, args, {
-      env: Object.assign({}, process.env, {
-        npm_config_node_gyp: path.join(__dirname, "..", "node_modules",
-          "node-gyp", "bin", "node-gyp.js")
-      })
+      env: {
+        ...process.env,
+        npm_config_node_gyp: gypPath
+      },
+      shell: process.platform === "win32"
     });
 
     spawnedNodePreGyp.stdout.on("data", function(data) {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ void GitRepository::GetReferencesWorker::Execute()`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`git_strarray_free(&reference_names);`
`64`		`- git_repository_free(repo);`
`65`	`64`	`delete baton->out;`
`66`	`65`	`baton->out = NULL;`
`67`	`66`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ void GitRepository::GetRemotesWorker::Execute()`
`51`	`51`	`if (giterr_last() != NULL) {`
`52`	`52`	`baton->error = git_error_dup(giterr_last());`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+ git_repository_free(repo);`
`54`	`56`	`delete baton->out;`
`55`	`57`	`baton->out = NULL;`
`56`	`58`	`return;`
`@@ -82,6 +84,9 @@ void GitRepository::GetRemotesWorker::Execute()`
`82`	`84`
`83`	`85`	`baton->out->push_back(remote);`
`84`	`86`	`}`
	`87`	`+`
	`88`	`+ git_strarray_free(&remote_names);`
	`89`	`+ git_repository_free(repo);`
`85`	`90`	`}`
`86`	`91`
`87`	`92`	`void GitRepository::GetRemotesWorker::HandleErrorCallback() {`