Free baton on error processing javascript arguments

julianmesa-gitkraken · julianmesa-gitkraken · commit 3ffe4db18409 · 2022-10-26T11:12:01.000+02:00
We only free baton, but we should try to free all previously allocated memory.
diff --git a/generate/templates/partials/async_function.cc b/generate/templates/partials/async_function.cc
@@ -64,7 +64,9 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
               );
 
               if (!conversionResult.result) {
-                delete[] baton->{{ arg.name }};
+                // TODO free previously allocated memory
+                free(baton->{{ arg.name }});
+                delete baton;
                 return Nan::ThrowError(Nan::New(conversionResult.error).ToLocalChecked());
               }
 
@@ -77,6 +79,7 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
           {
             auto conversionResult = Configurable{{ arg.cppClassName }}::fromJavascript(nodegitContext, info[{{ arg.jsArg }}]);
             if (!conversionResult.result) {
+              delete baton;
               return Nan::ThrowError(Nan::New(conversionResult.error).ToLocalChecked());
             }
 
diff --git a/generate/templates/partials/convert_from_v8.cc b/generate/templates/partials/convert_from_v8.cc
@@ -60,6 +60,7 @@
         Nan::Utf8String oidString(Nan::To<v8::String>(arrayVal).ToLocalChecked());
         string str = string(*oidString);
         if (git_oid_fromstr(&from_{{ name }}[i], str.c_str()) != GIT_OK) {
+          delete baton;
           if (git_error_last()) {
             return Nan::ThrowError(git_error_last()->message);
           } else {
@@ -93,6 +94,7 @@
     string str = string(*oidString);
     if (git_oid_fromstr(oidOut, str.c_str()) != GIT_OK) {
       free(oidOut);
+      delete baton;
 
       if (git_error_last()) {
         return Nan::ThrowError(git_error_last()->message);

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {`
`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 }});`
	`69`	`+ delete baton;`
`68`	`70`	`return Nan::ThrowError(Nan::New(conversionResult.error).ToLocalChecked());`
`69`	`71`	`}`
`70`	`72`
`@@ -77,6 +79,7 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {`
`77`	`79`	`{`
`78`	`80`	`auto conversionResult = Configurable{{ arg.cppClassName }}::fromJavascript(nodegitContext, info[{{ arg.jsArg }}]);`
`79`	`81`	`if (!conversionResult.result) {`
	`82`	`+ delete baton;`
`80`	`83`	`return Nan::ThrowError(Nan::New(conversionResult.error).ToLocalChecked());`
`81`	`84`	`}`
`82`	`85`