Fix segfault for JS binding, closes #510

tdewolff · Jul 10, 2022 · eeb7be4 · eeb7be4
1 parent 60ed0ce
commit eeb7be4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/bindings/js/minify.c b/bindings/js/minify.c
@@ -245,10 +245,16 @@ napi_value file(napi_env env, napi_callback_info info) {
     return NULL;
 }
 
+void cleanup() {
+    minifyCleanup();
+}
+
 napi_value init(napi_env env, napi_value exports) {
     napi_status status;
     napi_value fnConfig, fnString, fnFile;
 
+    status = napi_add_async_cleanup_hook(env, cleanup, NULL, NULL);
+
     status = napi_create_function(env, NULL, 0, config, NULL, &fnConfig);
     if (status != napi_ok) {
         return NULL;

diff --git a/bindings/js/minify.go b/bindings/js/minify.go
@@ -18,7 +18,7 @@ import (
 	"github.com/tdewolff/parse/v2/buffer"
 )
 
-var m minify.M
+var m *minify.M
 
 func init() {
 	minifyConfig(nil, nil, 0)
@@ -109,7 +109,7 @@ func minifyConfig(ckeys **C.char, cvals **C.char, length C.longlong) *C.char {
 		}
 	}
 
-	m = *minify.New()
+	m = minify.New()
 	m.Add("text/css", cssMinifier)
 	m.Add("text/html", htmlMinifier)
 	m.Add("image/svg+xml", svgMinifier)
@@ -164,4 +164,9 @@ func minifyFile(cmediatype, cinput, coutput *C.char) *C.char {
 	return nil
 }
 
+//export minifyCleanup
+func minifyCleanup() {
+	os.Exit(0)
+}
+
 func main() {}
diff --git a/bindings/py/minify.c b/bindings/py/minify.c
@@ -143,7 +143,6 @@ static struct PyModuleDef minifymodule = {
 };
 
 PyMODINIT_FUNC
-PyInit_minify(void)
-{
+PyInit_minify(void) {
     return PyModule_Create(&minifymodule);
 }
diff --git a/bindings/py/minify.go b/bindings/py/minify.go
@@ -19,7 +19,7 @@ import (
 	"github.com/tdewolff/parse/v2/buffer"
 )
 
-var m minify.M
+var m *minify.M
 
 func init() {
 	minifyConfig(nil, nil, 0)
@@ -110,7 +110,7 @@ func minifyConfig(ckeys **C.char, cvals **C.char, length C.longlong) *C.char {
 		}
 	}
 
-	m = *minify.New()
+	m = minify.New()
 	m.Add("text/css", cssMinifier)
 	m.Add("text/html", htmlMinifier)
 	m.Add("image/svg+xml", svgMinifier)