sendnrw/rdpgw
2
0
Fork 0
mirror of https://github.com/bolkedebruin/rdpgw.git synced 2026-03-30 23:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

testing dropping '00'

Browse Source
This commit is contained in:
Bolke de Bruin
2020-07-14 14:41:02 +02:00
parent 7bfc9e5012
commit 31f09af9d0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rdg.go
View File

@@ -619,8 +619,6 @@ func DecodeUTF16(b []byte) (string, error) {
return "", fmt.Errorf("must have even length byte slice") return "", fmt.Errorf("must have even length byte slice")
} }
b, _ = dropCR(b)
u16s := make([]uint16, 1) u16s := make([]uint16, 1)
ret := &bytes.Buffer{} ret := &bytes.Buffer{}
b8buf := make([]byte, 4) b8buf := make([]byte, 4)
@@ -633,7 +631,11 @@ func DecodeUTF16(b []byte) (string, error) {
ret.Write(b8buf[:n]) ret.Write(b8buf[:n])
} }
return ret.String(), nil bret := ret.Bytes()
if len(bret) > 0 && bret[len(bret)-1] == '\x00' {
bret = bret[:len(bret)-1]
}
return string(bret), nil
} }
// UTF-16 endian byte order // UTF-16 endian byte order