Merge pull request nodegit#1090 from smith-kyle/mem-safety-time

maxkorp · web-flow · commit 1e1a4d6d2686 · 2016-08-12T09:14:57.000-07:00
Memory management: duplicate time
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -2453,6 +2453,9 @@
         }
       }
     },
+    "time": {
+      "dupFunction": "git_time_dup"
+    },
     "trace": {
       "functions": {
         "git_trace_set": {
diff --git a/generate/templates/manual/include/functions/copy.h b/generate/templates/manual/include/functions/copy.h
@@ -15,6 +15,7 @@ const git_time *git_time_dup(const git_time *arg);
 const git_diff_delta *git_diff_delta_dup(const git_diff_delta *arg);
 const git_diff_file *git_diff_file_dup(const git_diff_file *arg);
 
+void git_time_dup(git_time **out, const git_time *arg);
 void git_transfer_progress_dup(git_transfer_progress **out, const git_transfer_progress *arg);
 
 #endif
diff --git a/generate/templates/manual/src/functions/copy.cc b/generate/templates/manual/src/functions/copy.cc
@@ -11,6 +11,11 @@ const git_error *git_error_dup(const git_error *arg) {
   return result;
 }
 
+void git_time_dup(git_time **out, const git_time *arg) {
+  *out = (git_time *)malloc(sizeof(git_time));
+  memcpy(*out, arg, sizeof(git_time));
+}
+
 void git_transfer_progress_dup(git_transfer_progress **out, const git_transfer_progress *arg) {
   *out = (git_transfer_progress *)malloc(sizeof(git_transfer_progress));
   memcpy(*out, arg, sizeof(git_transfer_progress));
diff --git a/test/tests/signature.js b/test/tests/signature.js
@@ -2,6 +2,7 @@ var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
 
+var garbageCollect = require("../utils/garbage_collect.js");
 var exec = require("../../utils/execPromise");
 
 describe("Signature", function() {
@@ -83,4 +84,26 @@ describe("Signature", function() {
       });
     });
   });
+
+  it("duplicates time", function() {
+    garbageCollect();
+    var Time = NodeGit.Time;
+    var startSelfFreeingCount = Time.getSelfFreeingInstanceCount();
+    var startNonSelfFreeingCount =
+      Time.getNonSelfFreeingConstructedCount();
+    var time = Signature.now(name, email).when();
+
+    garbageCollect();
+    var endSelfFreeingCount = Time.getSelfFreeingInstanceCount();
+    var endNonSelfFreeingCount = Time.getNonSelfFreeingConstructedCount();
+    // we should get one duplicated, self-freeing time
+    assert.equal(startSelfFreeingCount + 1, endSelfFreeingCount);
+    assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount);
+
+    time = null;
+    garbageCollect();
+    endSelfFreeingCount = Time.getSelfFreeingInstanceCount();
+    // the self-freeing time should get freed
+    assert.equal(startSelfFreeingCount, endSelfFreeingCount);
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -2453,6 +2453,9 @@`
`2453`	`2453`	`}`
`2454`	`2454`	`}`
`2455`	`2455`	`},`
	`2456`	`+ "time": {`
	`2457`	`+ "dupFunction": "git_time_dup"`
	`2458`	`+ },`
`2456`	`2459`	`"trace": {`
`2457`	`2460`	`"functions": {`
`2458`	`2461`	`"git_trace_set": {`