kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #30136 from tg123/master

Browse source 
Windows: return err instead of panic when convert string to utf16
This commit is contained in:
Alexander Morozov 2017-02-06 14:00:00 -08:00 committed by GitHub
commit d38753303a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/logger/etwlogs/etwlogs_windows.go
View file

@ -148,7 +148,13 @@ func callEventRegister() error {
}
func callEventWriteString(message string) error {
ret, _, _ := procEventWriteString.Call(uintptr(providerHandle), 0, 0, uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(message))))
utf16message, err := syscall.UTF16FromString(message)
if err != nil {
return err
}
ret, _, _ := procEventWriteString.Call(uintptr(providerHandle), 0, 0, uintptr(unsafe.Pointer(&utf16message[0])))
if ret != win32CallSuccess {
errorMessage := fmt.Sprintf("ETWLogs provider failed to log message. Error: %d", ret)
logrus.Error(errorMessage)