merge: upstream/master into master

MikeJerred · MikeJerred · commit adb53fa31256 · 2024-06-29T10:07:40.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Change Log
 
+## <a name="v0-28-0-alpha.27" href="#v0-28-0-alpha-27">v0.28.0-alpha.27</a> [(2024-06-06)](https://github.com/nodegit/nodegit/releases/tag/v0.28.0-alpha.27)
+
+[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.28.0-alpha.26...v0.28.0-alpha.27)
+
+#### Summary of changes
+- Build on Electron 29+
+
+#### Merged PRs into NodeGit
+- [Fix build failure on electron 29+](https://github.com/nodegit/nodegit/pull/1998)
+
+## <a name="v0-28-0-alpha.26" href="#v0-28-0-alpha-26">v0.28.0-alpha.26</a> [(2024-04-19)](https://github.com/nodegit/nodegit/releases/tag/v0.28.0-alpha.26)
+
+[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.28.0-alpha.25...v0.28.0-alpha.26)
+
+#### Summary of changes
+- Fix use-after-free in getRemotes
+
+#### Merged PRs into NodeGit
+- [Fix double-free introduced trying to fix other double-free](https://github.com/nodegit/nodegit/pull/1996)
+
+## <a name="v0-28-0-alpha.25" href="#v0-28-0-alpha-25">v0.28.0-alpha.25</a> [(2024-04-15)](https://github.com/nodegit/nodegit/releases/tag/v0.28.0-alpha.25)
+
+[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.28.0-alpha.24...v0.28.0-alpha.25)
+
+#### Summary of changes
+- Fix use-after-free in getReferences
+
+#### Merged PRs into NodeGit
+- [Don't free the given repo on error in getReferences and getRemotes](https://github.com/nodegit/nodegit/pull/1995)
+
 ## <a name="v0-28-0-alpha.24" href="#v0-28-0-alpha-24">v0.28.0-alpha.24</a> [(2024-02-20)](https://github.com/nodegit/nodegit/releases/tag/v0.28.0-alpha.24)
 
 [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.28.0-alpha.23...v0.28.0-alpha.24)
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;
@@ -80,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) {
@@ -51,6 +47,7 @@ void GitRepository::GetRemotesWorker::Execute()
     if (giterr_last() != NULL) {
       baton->error = git_error_dup(giterr_last());
     }
+
     delete baton->out;
     baton->out = NULL;
     return;
@@ -74,14 +71,15 @@ void GitRepository::GetRemotesWorker::Execute()
       }
 
       git_strarray_free(&remote_names);
-      git_repository_free(repo);
       delete baton->out;
       baton->out = NULL;
       return;
     }
 
     baton->out->push_back(remote);
   }
+
+  git_strarray_free(&remote_names);
 }
 
 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) {
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@axosoft/nan": "git://github.com/MikeJerred/nan.git",
+    "@axosoft/nan": "^2.19.0-gk.1",
     "@mapbox/node-pre-gyp": "^1.0.11",
     "fs-extra": "^10.0.0",
     "got": "^11.8.6",

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;`
`@@ -80,6 +79,8 @@ void GitRepository::GetReferencesWorker::Execute()`
`80`	`79`	`baton->out->push_back(reference);`
`81`	`80`	`}`
`82`	`81`	`}`
	`82`	`+`
	`83`	`+ git_strarray_free(&reference_names);`
`83`	`84`	`}`
`84`	`85`
`85`	`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) {`
`@@ -51,6 +47,7 @@ void GitRepository::GetRemotesWorker::Execute()`
`51`	`47`	`if (giterr_last() != NULL) {`
`52`	`48`	`baton->error = git_error_dup(giterr_last());`
`53`	`49`	`}`
	`50`	`+`
`54`	`51`	`delete baton->out;`
`55`	`52`	`baton->out = NULL;`
`56`	`53`	`return;`
`@@ -74,14 +71,15 @@ void GitRepository::GetRemotesWorker::Execute()`
`74`	`71`	`}`
`75`	`72`
`76`	`73`	`git_strarray_free(&remote_names);`
`77`		`- git_repository_free(repo);`
`78`	`74`	`delete baton->out;`
`79`	`75`	`baton->out = NULL;`
`80`	`76`	`return;`
`81`	`77`	`}`
`82`	`78`
`83`	`79`	`baton->out->push_back(remote);`
`84`	`80`	`}`
	`81`	`+`
	`82`	`+ git_strarray_free(&remote_names);`
`85`	`83`	`}`
`86`	`84`
`87`	`85`	`void GitRepository::GetRemotesWorker::HandleErrorCallback() {`