Skip to content

Commit 06d006a

Browse files
committed
Potentially fixing segmentation fault, see #510, #517, #518
1 parent 3784167 commit 06d006a

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

bindings/js/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module github.com/tdewolff/minify/bindings/js
33
go 1.18
44

55
require (
6-
github.com/tdewolff/minify/v2 v2.11.12
6+
github.com/tdewolff/minify/v2 v2.12.0
77
github.com/tdewolff/parse/v2 v2.6.1
88
)

bindings/js/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ github.com/tdewolff/minify/v2 v2.11.11 h1:f8Ux7FpWSYckQQaFLOLrgMGMuyTfzTyA57I46b
1111
github.com/tdewolff/minify/v2 v2.11.11/go.mod h1:NiPwIL/9TtJIYFYOkuz8HUJ/KuRg/kUb21tTp9Baz3k=
1212
github.com/tdewolff/minify/v2 v2.11.12 h1:LwC0+ayfFkLwIwpeun2T35FeUaO3f6XS2bus/QWAnC0=
1313
github.com/tdewolff/minify/v2 v2.11.12/go.mod h1:8mvf+KglD7XurfvvFZDUYvVURy6bA/r0oTvmakXMnyg=
14+
github.com/tdewolff/minify/v2 v2.12.0 h1:ZyvMKeciyR3vzJrK/oHyBcSmpttQ/V+ah7qOqTZclaU=
15+
github.com/tdewolff/minify/v2 v2.12.0/go.mod h1:8mvf+KglD7XurfvvFZDUYvVURy6bA/r0oTvmakXMnyg=
1416
github.com/tdewolff/parse/v2 v2.5.28/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
1517
github.com/tdewolff/parse/v2 v2.5.29 h1:Uf0OtZL9YaUXTuHEOitdo9lD90P0XTwCjZi+KbGChuM=
1618
github.com/tdewolff/parse/v2 v2.5.29/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=

bindings/js/minify.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ napi_value init(napi_env env, napi_value exports) {
253253
napi_status status;
254254
napi_value fnConfig, fnString, fnFile;
255255

256-
status = napi_add_async_cleanup_hook(env, cleanup, NULL, NULL);
256+
status = napi_add_env_cleanup_hook(env, cleanup, NULL);
257257

258258
status = napi_create_function(env, NULL, 0, config, NULL, &fnConfig);
259259
if (status != napi_ok) {

bindings/js/minify.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"os"
77
"regexp"
88
"strconv"
9+
"time"
910
"unsafe"
1011

1112
"github.com/tdewolff/minify/v2"
@@ -166,7 +167,7 @@ func minifyFile(cmediatype, cinput, coutput *C.char) *C.char {
166167

167168
//export minifyCleanup
168169
func minifyCleanup() {
169-
//os.Exit(0)
170+
time.Sleep(10 * time.Millisecond) // fixes Segmentation fault in Node workers
170171
}
171172

172173
func main() {}

bindings/js/test/worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (isMainThread) {
1212
worker.on('error', reject);
1313
worker.on('exit', (code) => {
1414
if (code !== 0)
15-
reject(new Error(`Worker stopped with exit code ${code}`));
15+
reject(new Error(`Worker stopped with exit code ${code}`));
1616
});
1717
})
1818
if (output != expected) {

0 commit comments

Comments
 (0)