Skip to content

Fix git_tree_entry double free #1332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
implausible merged 4 commits into from
Aug 30, 2017
Merged

Fix git_tree_entry double free #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62f5be6
Change tree_entry to not be selfFreeing
kurtb Jul 26, 2017
fb26b08
Remove leak test from tree_entry since it's no longer selfFreeing
kurtb Jul 26, 2017
f140847
Pull request feedback
kurtb Aug 16, 2017
67fc71d
Test for treebuilder insert memory management
kurtb Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2529,19 +2529,22 @@
"functions": {
"git_tree_entry_byid": {
"return": {
"ownedByThis": true
"ownedByThis": true,
"selfFreeing": false
}
},
"git_tree_entry_byindex": {
"jsFunctionName": "_entryByIndex",
"return": {
"ownedByThis": true
"ownedByThis": true,
"selfFreeing": false
}
},
"git_tree_entry_byname": {
"jsFunctionName": "_entryByName",
"return": {
"ownedByThis": true
"ownedByThis": true,
"selfFreeing": false
}
},
"git_tree_entrycount": {
Expand All @@ -2562,6 +2565,21 @@
"git_treebuilder_filter": {
"ignore": true
},
"git_treebuilder_get": {
"return": {
"selfFreeing": false,
"ownedByThis": true
}
},
"git_treebuilder_insert": {
"isAsync": false,
"args": {
"out": {
"selfFreeing": false,
"ownedByThis": true
}
}
},
"git_treebuilder_write": {
"args": {
"id": {
Expand Down
19 changes: 19 additions & 0 deletions test/tests/treebuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ var promisify = require("promisify-node");
var readDir = promisify(fs.readdir);
var local = path.join.bind(path, __dirname);

var leakTest = require("../utils/leak_test");

describe("TreeBuilder", function(){

var Git = require("../../");
var reposPath = local("../repos/workdir");
var oid = "111dd657329797f6165f52f5085f61ac976dcf04";

//setup test repo each test
beforeEach(function() {
var test = this;
Expand Down Expand Up @@ -76,4 +80,19 @@ describe("TreeBuilder", function(){
return Git.Tree.lookup(test.repo, newTreeEntry.oid());
});
});

it("does not leak inserts", function() {
var test = this;

// The underlying C++ git_tree_entry is owned by the treebuilder that
// creates it. But since git_tree_entry is duplicable the generator will
// duplicate it and mark it as self freeing.
// Validate this with the leakTest.
return leakTest(Git.TreeEntry, function() {
return Git.Treebuilder.create(test.repo, null)
.then(function(builder) {
return builder.insert("test", oid, Git.TreeEntry.FILEMODE.BLOB);
});
});
});
});