Revert previous change and fix non zero issue

medallia · Dec 12, 2018 · e124595 · e124595
1 parent 5a41de4
commit e124595
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/dcmi.go b/dcmi.go
@@ -73,7 +73,7 @@ func (r *DcmiGetMcIdResponse) UnmarshalBinary(buf []byte) error {
 	r.CompletionCode = CompletionCode(buf[0])
 	r.GroupExtensionId = buf[1]
 	r.NumBytes = buf[2]
-	ending := len(buf) - 1
+	ending := len(buf)
 	for idx, b := range buf[3:] {
 		if b == 0x00 {
 			ending = idx + 3

diff --git a/tool.go b/tool.go
@@ -135,9 +135,7 @@ func responseFromBytes(msg []byte, r Response) error {
 
 func responseFromString(s string, r Response) error {
 	// Remove trailing spaces and newlines from string received.
-	// Add some zeros to avoid endianess problems during unmarshaling in border cases
-	// fmt.Printf("Message received: %s\n", s)
-	msg := rawDecode(fmt.Sprintf("%s0000", strings.Replace(strings.TrimSpace(s), "\n", "", -1)))
+	msg := rawDecode(strings.Replace(strings.TrimSpace(s), "\n", "", -1))
 	return responseFromBytes(msg, r)
 }