fix: skip int struct field (#71)

Author: trim21

internal/decoder/context.go

@@ -80,6 +80,31 @@ func skipClassName(buf []byte, cursor int64) (int64, error) {
 	return end - 2, err
 }
 
+// i:{};
+// the cursor should point to the beginning `i`
+// and it will point to the byte after `;`
+func skipInt(buf []byte, cursor int64) (int64, error) {
+	cursor++
+
+	if buf[cursor] != ':' {
+		return cursor, errors.ErrUnexpected("':' after type operator `i`", cursor, buf[cursor])
+	}
+
+	cursor++
+
+	for isInteger[buf[cursor]] {
+		cursor++
+	}
+
+	if buf[cursor] != ';' {
+		return cursor, errors.ErrUnexpected("';' after integer", cursor, buf[cursor])
+	}
+
+	cursor++
+
+	return cursor, nil
+}
+
 func skipString(buf []byte, cursor int64) (int64, error) {
 	cursor++
 	sLen, end, err := readLength(buf, cursor)
@@ -141,12 +166,7 @@ func skipValue(buf []byte, cursor, depth int64) (int64, error) {
 		return skipString(buf, cursor)
 	// case 'd':
 	case 'i':
-		cursor++
-		end, err := skipLengthWithBothColon(buf, cursor)
-		if err != nil {
-			return cursor, err
-		}
-		return end + 1, nil
+		return skipInt(buf, cursor)
 	case 'b':
 		cursor++
 		if buf[cursor] != ':' {

internal/errors/error.go

@@ -92,7 +92,7 @@ func ErrUnexpectedEnd(msg string, cursor int64) *SyntaxError {
 }
 
 func ErrUnexpected(msg string, cursor int64, c byte) *SyntaxError {
-	return &SyntaxError{msg: fmt.Sprintf("php-serialize: expecting %s, get char '%c' instead", msg, c), Offset: cursor}
+	return &SyntaxError{msg: fmt.Sprintf("php-serialize: expecting %s, get char '%c' instead at offset: %d", msg, c, cursor), Offset: cursor}
 }
 
 func ErrInvalidCharacter(c byte, context string, cursor int64) *SyntaxError {

taskfile.yaml

@@ -0,0 +1,4 @@
+version: 3
+tasks:
+  test:
+    - go test '-coverpkg=github.com/trim21/go-phpserialize/...' -covermode=atomic -coverprofile=coverage.out -count=1 ./...

tests/unmarshal_test.go

@@ -653,3 +653,22 @@ func TestUnmarshal_error_case(t *testing.T) {
 	err := phpserialize.Unmarshal([]byte(raw), &tags)
 	require.NoError(t, err)
 }
+
+func TestUnmarshal_issue_69(t *testing.T) {
+	type UnionInfo struct {
+		CompanyId int    `php:"company_id" json:"company_id"`
+		CorpID    string `php:"corp_id" json:"corp_id"`
+		OpenID    string `php:"openid" json:"openid"`
+		From      string `php:"from" json:"from"`
+		Uid       int    `php:"uid" json:"uid"`
+		UnionID   string `php:"unionid" json:"unionid"`
+		OrgUid    int    `php:"org_uid,omitempty" json:"org_uid"`
+		FromType  int    `php:"from_type" json:"from_type"`
+	}
+
+	ddd := `a:7:{s:4:"from";s:4:"ding";s:6:"openid";s:15:"360946652480232";s:7:"unionid";s:26:"0Cg1QDDRfgyz8qMjqwwN0giEiE";s:10:"company_id";i:1;s:7:"corp_id";s:36:"ding4eb8f5a40a6244aa35c2f4657eb6378f";s:8:"agent_id";i:894146310;s:3:"uid";i:2;}`
+
+	unionInfo := UnionInfo{}
+
+	require.NoError(t, phpserialize.Unmarshal([]byte(ddd), &unionInfo))
+}