Fixed seg faults for callback functions

John Haley · tbranyen · commit 17ef8ba04d9f · 2014-10-23T10:47:36.000-04:00
diff --git a/generate/partials/field_accessors.cc b/generate/partials/field_accessors.cc
@@ -31,10 +31,12 @@ NAN_SETTER({{ cppClassName }}::Set{{ field.cppFunctionName }}) {
   NanDisposePersistent(wrapper->{{ field.name }});
 
   wrapper->raw->{{ field.name }} = *ObjectWrap::Unwrap<{{ field.cppClassName }}>(value->ToObject())->GetValue();
-  {%elsif field.isFunction | or field.payloadFor %}
+  {%elsif field.isFunction %}
   if (value->IsFunction()) {
     wrapper->credentials = new NanCallback(value.As<Function>());
   }
+  {%elsif field.payloadFor %}
+  NanAssignPersistent(wrapper->{{ field.name }}, value);
   {%elsif field.cppClassName == 'String' %}
   if (wrapper->GetValue()->{{ field.name }}) {
     //free(wrapper->{{ field.name }});
diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -47,11 +47,18 @@ void {{ cppClassName }}::ConstructFields() {
     {%if field.hasConstructor %}
   Local<Object> test = {{ field.cppClassName }}::New(&this->raw->{{ field.name }})->ToObject();
   NanAssignPersistent(this->{{ field.name }}, test);
+
     {%elsif field.isFunction %}
+
   // Set the static method call and set the payload for this function to be
   // the current instance
   this->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;
   this->raw->{{ fields|payloadFor field.name }} = (void *)this;
+  this->{{ field.name }} = new NanCallback();
+    {%elsif field.payloadFor %}
+
+  Local<Value> {{ field.name }} = NanUndefined();
+  NanAssignPersistent(this->{{ field.name }}, {{ field.name }});
     {%endif%}
   {%endeach%}
 }
