deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

[v3 windows] Prevent crash when nulls in strings

Browse source
This commit is contained in:
Lea Anthony 2023-06-12 09:10:47 +10:00
commit 286ce206f0
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
v3/pkg/w32/window.go
View file

@ -7,6 +7,7 @@ import (
"github.com/samber/lo"
"log"
"strconv"
"strings"
"sync"
"syscall"
"unsafe"
@ -121,7 +122,18 @@ func showWindow(hwnd uintptr, cmdshow int) bool {
return ret != 0
}
func stripNulls(str string) string {
// Split the string into substrings at each null character
substrings := strings.Split(str, "\x00")
// Join the substrings back into a single string
strippedStr := strings.Join(substrings, "")
return strippedStr
}
func MustStringToUTF16Ptr(input string) *uint16 {
input = stripNulls(input)
result, err := syscall.UTF16PtrFromString(input)
if err != nil {
Fatal(err.Error())
@ -130,11 +142,13 @@ func MustStringToUTF16Ptr(input string) *uint16 {
}
func MustStringToUTF16uintptr(input string) uintptr {
input = stripNulls(input)
ret := lo.Must(syscall.UTF16PtrFromString(input))
return uintptr(unsafe.Pointer(ret))
}
func MustStringToUTF16(input string) []uint16 {
input = stripNulls(input)
return lo.Must(syscall.UTF16FromString(input))
}