Skip to content

Fix tree entry leaks #1138

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
johnhaley81 merged 2 commits into from
Oct 7, 2016
Merged

Fix tree entry leaks #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80937a3
Mark tree entry as selfFreeing
srajko Sep 7, 2016
0a707b0
Add tree entry leak test
srajko Sep 23, 2016
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
11 changes: 9 additions & 2 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2499,10 +2499,16 @@
}
},
"git_tree_entry_byindex": {
"jsFunctionName": "_entryByIndex"
"jsFunctionName": "_entryByIndex",
"return": {
"ownedByThis": true
}
},
"git_tree_entry_byname": {
"jsFunctionName": "_entryByName"
"jsFunctionName": "_entryByName",
"return": {
"ownedByThis": true
}
},
"git_tree_entrycount": {
"jsFunctionName": "entryCount"
Expand Down Expand Up @@ -2539,6 +2545,7 @@
}
},
"tree_entry": {
"selfFreeing": true,
"dupFunction": "git_tree_entry_dup",
"freeFunctionName": "git_tree_entry_free",
"functions": {
Expand Down
7 changes: 1 addition & 6 deletions generate/scripts/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ var Helpers = {
arg.cppClassName = Helpers.cTypeToCppName(arg.cType);
arg.jsClassName = utils.titleCase(Helpers.cTypeToJsName(arg.cType));

var libgitType = Helpers.decorateLibgitType(arg, libgit2.types, enums);
Helpers.decorateLibgitType(arg, libgit2.types, enums);

// Some arguments can be callbacks
if (Helpers.isCallbackFunction(type)) {
Expand Down Expand Up @@ -280,11 +280,6 @@ var Helpers = {
argOverrides.cppClassName !== "Array" &&
_.every(allArgs, function(_arg) { return !_arg.isSelf; });
}

if (arg.isReturn && libgitType) {
arg.selfFreeing = libgitType.selfFreeing;
}

if (arg.isReturn && fnDef.return && fnDef.return.type === "int") {
fnDef.return.isErrorCode = true;
fnDef.isAsync = true;
Expand Down
13 changes: 13 additions & 0 deletions test/tests/tree_entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ var assert = require("assert");
var path = require("path");
var local = path.join.bind(path, __dirname);

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

describe("TreeEntry", function() {
var NodeGit = require("../../");
var Repository = NodeGit.Repository;
Expand Down Expand Up @@ -153,4 +155,15 @@ describe("TreeEntry", function() {
assert.equal(entry.isSubmodule(), false);
});
});

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

return leakTest(NodeGit.TreeEntry, function() {
return test.commit.getTree()
.then(function(tree) {
return tree.entryByPath("example");
});
});
});
});