add yet more fixes from Julian

zawata · zawata · commit 231f4721dc97 · 2025-11-26T12:14:05.000-07:00
diff --git a/generate/templates/partials/async_function.cc b/generate/templates/partials/async_function.cc
@@ -56,20 +56,21 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
         {% if arg.cppClassName == 'Array' %}
           {
             v8::Local<v8::Array> tempArray = v8::Local<v8::Array>::Cast(info[{{ arg.jsArg }}]);
-            baton->{{ arg.name }} = new {{ arg.cType|unPointer }}[tempArray->Length()];
+            baton->{{ arg.name }} = ({{ arg.cType|unPointer }}*)malloc(sizeof({{ arg.cType|unPointer }}) * tempArray->Length());
             for (uint32_t i = 0; i < tempArray->Length(); ++i) {
               auto conversionResult = Configurable{{ arg.arrayElementCppClassName }}::fromJavascript(
                 nodegitContext,
                 Nan::Get(tempArray, i).ToLocalChecked()
               );
 
               if (!conversionResult.result) {
-                delete[] baton->{{ arg.name }};
+                // TODO free previously allocated memory
+                free(baton->{{ arg.name }});
                 return Nan::ThrowError(Nan::New(conversionResult.error).ToLocalChecked());
               }
 
               auto convertedObject = conversionResult.result;
-              cleanupHandles["{{ arg.name }}"] = convertedObject;
+              cleanupHandles[std::string("{{ arg.name }}") + std::to_string(i)] = convertedObject;
               baton->{{ arg.name }}[i] = *convertedObject->GetValue();
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -56,20 +56,21 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {`
`56`	`56`	`{% if arg.cppClassName == 'Array' %}`
`57`	`57`	`{`
`58`	`58`	`v8::Local<v8::Array> tempArray = v8::Local<v8::Array>::Cast(info[{{ arg.jsArg }}]);`
`59`		`- baton->{{ arg.name }} = new {{ arg.cType\|unPointer }}[tempArray->Length()];`
	`59`	`+ baton->{{ arg.name }} = ({{ arg.cType\|unPointer }})malloc(sizeof({{ arg.cType\|unPointer }}) tempArray->Length());`
`60`	`60`	`for (uint32_t i = 0; i < tempArray->Length(); ++i) {`
`61`	`61`	`auto conversionResult = Configurable{{ arg.arrayElementCppClassName }}::fromJavascript(`
`62`	`62`	`nodegitContext,`
`63`	`63`	`Nan::Get(tempArray, i).ToLocalChecked()`
`64`	`64`	`);`
`65`	`65`
`66`	`66`	`if (!conversionResult.result) {`
`67`		`- delete[] baton->{{ arg.name }};`
	`67`	`+ // TODO free previously allocated memory`
	`68`	`+ free(baton->{{ arg.name }});`
`68`	`69`	`return Nan::ThrowError(Nan::New(conversionResult.error).ToLocalChecked());`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`auto convertedObject = conversionResult.result;`
`72`		`- cleanupHandles["{{ arg.name }}"] = convertedObject;`
	`73`	`+ cleanupHandles[std::string("{{ arg.name }}") + std::to_string(i)] = convertedObject;`
`73`	`74`	`baton->{{ arg.name }}[i] = *convertedObject->GetValue();`
`74`	`75`	`}`
`75`	`76`	`}`