Credentials are passing but getting seg faults

John Haley · tbranyen · commit e33ed5e325a6 · 2014-10-23T10:47:34.000-04:00
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -1,4 +1,4 @@
-{ 
+{
   "attr": {
     "cType": null,
 
@@ -286,8 +286,9 @@
     "functions": {
       "git_cred_ssh_key_from_agent": {
         "ignore": false,
-        "isPrototypeMethod": true,
-        "args": [{ "isSelf": true }]
+        "isPrototypeMethod": false,
+        "args": [{ "isSelf": false }],
+        "isAsync": false
       }
     }
   },
diff --git a/generate/partials/field_accessors.cc b/generate/partials/field_accessors.cc
@@ -66,7 +66,6 @@ NAN_SETTER({{ cppClassName }}::Set{{ field.cppFunctionName }}) {
 
   {%each field.args|argsInfo as arg %}
   baton->{{ arg.name }} = {{ arg.name }};
-
   {%endeach%}
   baton->req.data = baton;
   baton->done = false;
@@ -78,7 +77,7 @@ NAN_SETTER({{ cppClassName }}::Set{{ field.cppFunctionName }}) {
   }
 
   {%each field|returnsInfo true false as _return %}
-  {{ _return.name }} = baton->{{ _return.name }};
+  *{{ _return.name }} = *baton->{{ _return.name }};
   {%endeach%}
 
   return baton->result;
@@ -116,20 +115,21 @@ void {{ cppClassName }}::{{ field.name }}_asyncAfter(uv_work_t* req, int status)
     {%endeach%}
   };
 
+  TryCatch tryCatch;
   Local<Value> result = Local<Value>::New(Function::Cast(*instance->{{ field.name }})->Call(Context::GetCurrent()->Global(), {{ field.args|jsArgsCount }}, argv));
   {{ field.returnType }} resultStatus;
 
   {%each field|returnsInfo true false as _return%}
-  if (!result->IsNull() && !result->IsUndefined()) {
+  if (result.IsEmpty() || result->IsNativeError()) {
+    baton->result = {{ field.returnError }};
+  }
+  else if (!result->IsNull() && !result->IsUndefined()) {
     {{ _return.cppClassName }}* wrapper = ObjectWrap::Unwrap<{{ _return.cppClassName }}>(result->ToObject());
     wrapper->selfFreeing = false;
 
     baton->{{ _return.name }} = wrapper->GetRefValue();
     baton->result = {{ field.returnSuccess }};
   }
-  else if (result->IsNativeError()) {
-    baton->result = {{ field.returnError }};
-  }
   else {
     baton->result = {{ field.returnNoResults }};
   }
diff --git a/generate/setup.js b/generate/setup.js
@@ -298,7 +298,9 @@ fileNames.forEach(function(fileName, index) {
     descriptor.isConstructorMethod = isCtor;
 
     // Set the prototype method argument.
-    descriptor.isPrototypeMethod = !descriptor.isConstructorMethod;
+    if (functionDescriptor.isPrototypeMethod !== false) {
+      descriptor.isPrototypeMethod = !descriptor.isConstructorMethod;
+    }
 
     var hasReturn = false;
 
diff --git a/test/tests/clone.js b/test/tests/clone.js
@@ -48,10 +48,8 @@ describe("Clone", function() {
     var opts = {
       ignoreCertErrors: 1,
       remoteCallbacks: {
-        credentials: function() {
-          var cred = new NodeGit.GitCred();
-          cred.keyFromSshAgent("git");
-          return cred;
+        credentials: function(url, userName) {
+          return NodeGit.Cred.sshKeyFromAgent(userName);
         }
       }
     };

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,8 @@ describe("Clone", function() {`
`48`	`48`	`var opts = {`
`49`	`49`	`ignoreCertErrors: 1,`
`50`	`50`	`remoteCallbacks: {`
`51`		`- credentials: function() {`
`52`		`- var cred = new NodeGit.GitCred();`
`53`		`- cred.keyFromSshAgent("git");`
`54`		`- return cred;`
	`51`	`+ credentials: function(url, userName) {`
	`52`	`+ return NodeGit.Cred.sshKeyFromAgent(userName);`
`55`	`53`	`}`
`56`	`54`	`}`
`57`	`55`	`};`