fix: unmarshal string array wrong cursor

muktihari · Dec 18, 2023 · 77ada8a · 77ada8a
1 parent 2c8b431
commit 77ada8a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/profile/typedef/unmarshal.go b/profile/typedef/unmarshal.go
@@ -118,17 +118,23 @@ func Unmarshal(b []byte, bo binary.ByteOrder, ref basetype.BaseType, isArray boo
 	case basetype.String:
 		if isArray {
 			var size byte
+			last := 0
 			for i := range b {
 				if b[i] == '\x00' {
-					size++
+					if last != i { // only if not an invalid string
+						size++
+					}
+					last = i + 1
 				}
 			}
-			last := 0
+			last = 0
 			vs := make([]string, 0, size)
 			for i := range b {
 				if b[i] == '\x00' {
-					vs = append(vs, string(b[last:i]))
-					last = i + i
+					if last != i { // only if not an invalid string
+						vs = append(vs, string(b[last:i]))
+					}
+					last = i + 1
 				}
 			}
 			return vs, nil