Set a finalizer to free marshalled PHPExports

Author: arnaud-lb

php-go/marshal.go

@@ -56,3 +56,7 @@ func marshalExport(cpe *C.php_export, pe *PHPExport) {
 	}
 	cpe.num_outs = C.size_t(len(pe.outs))
 }
+
+func freeMarshalled(cpe *CPHPExports) {
+	C.free_php_exports((*C.php_exports)(cpe))
+}

php-go/phpgo.c

@@ -24,12 +24,12 @@ php_arg_desc * init_php_export_out(php_export * pe, size_t i) {
 }
 
 void free_php_exports(php_exports * pes) {
-    int i;
-    for (i = 0; i < pes->exports; i++) {
+    size_t i;
+    for (i = 0; i < pes->num_exports; i++) {
         php_export * pe = &pes->exports[i];
         free(pe->ins);
         free(pe->outs);
     }
-    free(pe->exports);
-    free(pe);
+    free(pes->exports);
+    free(pes);
 }

php-go/phpgo.go

@@ -3,6 +3,7 @@ package php
 import (
 	"fmt"
 	"reflect"
+	"runtime"
 	"sort"
 )
 
@@ -54,6 +55,7 @@ func Export(name string, exports map[string]interface{}) *PHPExports {
 func newPHPExports(exports map[string]interface{}) (*PHPExports, error) {
 
 	phpExports := &PHPExports{}
+	runtime.SetFinalizer(phpExports, phpExportsFinalizer)
 
 	for name, e := range exports {
 		if pe, err := newPHPExport(name, e); err != nil {
@@ -70,6 +72,12 @@ func newPHPExports(exports map[string]interface{}) (*PHPExports, error) {
 	return phpExports, nil
 }
 
+func phpExportsFinalizer(pes *PHPExports) {
+	if pes.c != nil {
+		freeMarshalled(pes.c)
+	}
+}
+
 func newPHPArgDesc(t reflect.Type, nth int) (*PHPArgDesc, error) {
 
 	kind, ok := kindMap[t.Kind()]

php-go/phpgo.h

@@ -64,6 +64,7 @@ php_exports * new_php_exports(size_t num_exports);
 php_export * init_php_exports_export(php_exports * pes, size_t i, size_t num_ins, size_t num_outs);
 php_arg_desc * init_php_export_in(php_export * pe, size_t i);
 php_arg_desc * init_php_export_out(php_export * pe, size_t i);
+void free_php_exports(php_exports * pes);
 
 #endif /* PHPGO_H */