Fix issues for Python and NodeJS bindings on 32-bit systems, see #707

tdewolff · May 25, 2024 · d4342bd · d4342bd
1 parent 06a486e
commit d4342bd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -1,6 +1,8 @@
 name: NodeJS
 on:
   push:
+    branches:
+    - master
     tags:
     - 'v*'
   pull_request:

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -1,6 +1,8 @@
 name: Python
 on:
   push:
+    branches:
+    - master
     tags:
     - 'v*'
   pull_request:

diff --git a/bindings/js/minify.go b/bindings/js/minify.go
@@ -24,17 +24,13 @@ func init() {
 	minifyConfig(nil, nil, 0)
 }
 
-func goBytes(str *C.char, length C.longlong) []byte {
-	return (*[1 << 30]byte)(unsafe.Pointer(str))[:length:length]
-}
-
 func goStringArray(carr **C.char, length C.longlong) []string {
 	if length == 0 {
 		return []string{}
 	}
 
 	strs := make([]string, length)
-	arr := (*[1 << 30]*C.char)(unsafe.Pointer(carr))[:length:length]
+	arr := unsafe.Slice(carr, length)
 	for i := 0; i < int(length); i++ {
 		strs[i] = C.GoString(arr[i])
 	}
@@ -124,8 +120,8 @@ func minifyConfig(ckeys **C.char, cvals **C.char, length C.longlong) *C.char {
 //export minifyString
 func minifyString(cmediatype, cinput *C.char, input_length C.longlong, coutput *C.char, output_length *C.longlong) *C.char {
 	mediatype := C.GoString(cmediatype) // copy
-	input := goBytes(cinput, input_length)
-	output := goBytes(coutput, input_length)
+	input := C.GoBytes(unsafe.Pointer(cinput), C.int(input_length))
+	output := C.GoBytes(unsafe.Pointer(coutput), C.int(input_length))
 
 	out := buffer.NewStaticWriter(output[:0])
 	if err := m.Minify(mediatype, out, buffer.NewReader(input)); err != nil {

diff --git a/bindings/py/minify.go b/bindings/py/minify.go
@@ -24,17 +24,13 @@ func init() {
 	minifyConfig(nil, nil, 0)
 }
 
-func goBytes(str *C.char, length C.longlong) []byte {
-	return (*[1 << 30]byte)(unsafe.Pointer(str))[:length:length]
-}
-
 func goStringArray(carr **C.char, length C.longlong) []string {
 	if length == 0 {
 		return []string{}
 	}
 
 	strs := make([]string, length)
-	arr := (*[1 << 30]*C.char)(unsafe.Pointer(carr))[:length:length]
+	arr := unsafe.Slice(carr, length)
 	for i := 0; i < int(length); i++ {
 		strs[i] = C.GoString(arr[i])
 	}
@@ -124,8 +120,8 @@ func minifyConfig(ckeys **C.char, cvals **C.char, length C.longlong) *C.char {
 //export minifyString
 func minifyString(cmediatype, cinput *C.char, input_length C.longlong, coutput *C.char, output_length *C.longlong) *C.char {
 	mediatype := C.GoString(cmediatype) // copy
-	input := goBytes(cinput, input_length)
-	output := goBytes(coutput, input_length)
+	input := C.GoBytes(unsafe.Pointer(cinput), C.int(input_length))
+	output := C.GoBytes(unsafe.Pointer(coutput), C.int(input_length))
 
 	out := buffer.NewStaticWriter(output[:0])
 	if err := m.Minify(mediatype, out, buffer.NewReader(input)); err != nil {