From 31f09af9d039498c606f1e400fd1283ea808b6b5 Mon Sep 17 00:00:00 2001
From: Bolke de Bruin <bolke@xs4all.nl>
Date: Tue, 14 Jul 2020 14:41:02 +0200
Subject: [PATCH] testing dropping '00'
---
rdg.go | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/rdg.go b/rdg.go
index 6e45946..9ebad66 100644
--- a/rdg.go
+++ b/rdg.go
@@ -619,8 +619,6 @@ func DecodeUTF16(b []byte) (string, error) {
return "", fmt.Errorf("must have even length byte slice")
}
- b, _ = dropCR(b)
-
u16s := make([]uint16, 1)
ret := &bytes.Buffer{}
b8buf := make([]byte, 4)
@@ -633,7 +631,11 @@ func DecodeUTF16(b []byte) (string, error) {
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
--
GitLab