fix: minor fix, format code

Mikubill · Mikubill · commit 2a2d530ae79d · 2022-10-03T16:23:21.000Z
diff --git a/gofakes3.go b/gofakes3.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"sync/atomic"
 	"time"
-	
+
 	xml "github.com/Mikubill/gofakes3/xml"
 )
 
diff --git a/xml/atom_test.go b/xml/atom_test.go
@@ -53,4 +53,4 @@ func NewText(text string) Text {
 	return Text{
 		Body: text,
 	}
-}
+}
diff --git a/xml/example_marshaling_test.go b/xml/example_marshaling_test.go
@@ -81,4 +81,4 @@ func Example_customMarshalXML() {
 	// * Gophers: 3
 	// * Zebras:  2
 	// * Unknown: 3
-}
+}
diff --git a/xml/example_test.go b/xml/example_test.go
@@ -148,4 +148,4 @@ func ExampleUnmarshal() {
 	// Email: [{home gre@example.com} {work gre@work.com}]
 	// Groups: [Friends Squash]
 	// Address: {Hanga Roa Easter Island}
-}
+}
diff --git a/xml/example_test_marshaling_test.go b/xml/example_test_marshaling_test.go
@@ -76,4 +76,4 @@ func Example_textMarshalXML() {
 	// * Small:        3
 	// * Large:        2
 	// * Unrecognized: 3
-}
+}
diff --git a/xml/marshal.go b/xml/marshal.go
@@ -1059,4 +1059,4 @@ func isEmptyValue(v reflect.Value) bool {
 		return v.IsNil()
 	}
 	return false
-}
+}
diff --git a/xml/marshal_test.go b/xml/marshal_test.go
@@ -2529,4 +2529,4 @@ func TestMarshalZeroValue(t *testing.T) {
 	if string(anotherXML) != proofXml {
 		t.Fatalf("unexpected unmarshal result, want %q but got %q", proofXml, anotherXML)
 	}
-}
+}
diff --git a/xml/read.go b/xml/read.go
@@ -145,7 +145,7 @@ func (d *Decoder) Decode(v interface{}) error {
 // but also wants to defer to Unmarshal for some elements.
 func (d *Decoder) DecodeElement(v interface{}, start *StartElement) error {
 	val := reflect.ValueOf(v)
-	if val.Kind() != reflect.Pointer {
+	if val.Kind() != reflect.Ptr {
 		return errors.New("non-pointer passed to Unmarshal")
 	}
 
@@ -768,4 +768,4 @@ func (d *Decoder) Skip() error {
 			depth--
 		}
 	}
-}
+}
diff --git a/xml/read_test.go b/xml/read_test.go
@@ -1125,4 +1125,4 @@ func TestCVE202228131(t *testing.T) {
 	} else if !errors.Is(err, errExeceededMaxUnmarshalDepth) {
 		t.Fatalf("Unmarshal unexpected error: got %q, want %q", err, errExeceededMaxUnmarshalDepth)
 	}
-}
+}
diff --git a/xml/typeinfo.go b/xml/typeinfo.go
@@ -115,8 +115,8 @@ func structFieldInfo(typ reflect.Type, f *reflect.StructField) (*fieldInfo, erro
 
 	// Split the tag from the xml namespace if necessary.
 	tag := f.Tag.Get("xml")
-	if ns, t, ok := strings.Cut(tag, " "); ok {
-		finfo.xmlns, tag = ns, t
+	if i := strings.Index(tag, " "); i >= 0 {
+		finfo.xmlns, tag = tag[:i], tag[i+1:]
 	}
 
 	// Parse flags.
@@ -229,7 +229,7 @@ func structFieldInfo(typ reflect.Type, f *reflect.StructField) (*fieldInfo, erro
 // in case it exists and has a valid xml field tag, otherwise
 // it returns nil.
 func lookupXMLName(typ reflect.Type) (xmlname *fieldInfo) {
-	for typ.Kind() == reflect.Pointer {
+	for typ.Kind() == reflect.Ptr {
 		typ = typ.Elem()
 	}
 	if typ.Kind() != reflect.Struct {
@@ -371,4 +371,4 @@ func (finfo *fieldInfo) value(v reflect.Value, shouldInitNilPointers bool) refle
 		v = v.Field(x)
 	}
 	return v
-}
+}
diff --git a/xml/xml.go b/xml/xml.go
@@ -1169,11 +1169,11 @@ func (d *Decoder) nsname() (name Name, ok bool) {
 	}
 	if strings.Count(s, ":") > 1 {
 		name.Local = s
-	} else if space, local, ok := strings.Cut(s, ":"); !ok || space == "" || local == "" {
+	} else if i := strings.Index(s, ":"); i < 1 || i > len(s)-2 {
 		name.Local = s
 	} else {
-		name.Space = space
-		name.Local = local
+		name.Space = s[0:i]
+		name.Local = s[i+1:]
 	}
 	return name, true
 }
@@ -1910,7 +1910,7 @@ var (
 		'\x05': []byte("&#x5;"),
 		'\x06': []byte("&#x6;"),
 		'\x07': []byte("&#x7;"),
-	}	
+	}
 )
 
 // EscapeText writes to w the properly escaped XML equivalent
@@ -2036,26 +2036,25 @@ func emitCDATA(w io.Writer, s []byte) error {
 	if _, err := w.Write(cdataStart); err != nil {
 		return err
 	}
-
 	for {
-		before, after, ok := bytes.Cut(s, cdataEnd)
-		if !ok {
+		i := bytes.Index(s, cdataEnd)
+		if i >= 0 && i+len(cdataEnd) <= len(s) {
+			// Found a nested CDATA directive end.
+			if _, err := w.Write(s[:i]); err != nil {
+				return err
+			}
+			if _, err := w.Write(cdataEscape); err != nil {
+				return err
+			}
+			i += len(cdataEnd)
+		} else {
+			if _, err := w.Write(s); err != nil {
+				return err
+			}
 			break
 		}
-		// Found a nested CDATA directive end.
-		if _, err := w.Write(before); err != nil {
-			return err
-		}
-		if _, err := w.Write(cdataEscape); err != nil {
-			return err
-		}
-		s = after
+		s = s[i:]
 	}
-
-	if _, err := w.Write(s); err != nil {
-		return err
-	}
-
 	_, err := w.Write(cdataEnd)
 	return err
 }
@@ -2066,16 +2065,20 @@ func procInst(param, s string) string {
 	// TODO: this parsing is somewhat lame and not exact.
 	// It works for all actual cases, though.
 	param = param + "="
-	_, v, _ := strings.Cut(s, param)
+	idx := strings.Index(s, param)
+	if idx == -1 {
+		return ""
+	}
+	v := s[idx+len(param):]
 	if v == "" {
 		return ""
 	}
 	if v[0] != '\'' && v[0] != '"' {
 		return ""
 	}
-	unquote, _, ok := strings.Cut(v[1:], v[:1])
-	if !ok {
+	idx = strings.IndexRune(v[1:], rune(v[0]))
+	if idx == -1 {
 		return ""
 	}
-	return unquote
-}
+	return v[1 : idx+1]
+}
diff --git a/xml/xml_test.go b/xml/xml_test.go
@@ -1263,4 +1263,4 @@ func TestHTMLAutoClose(t *testing.T) {
 			}
 		}
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"strings"`
`16`	`16`	`"sync/atomic"`
`17`	`17`	`"time"`
`18`		`-`
	`18`	`+`
`19`	`19`	`xml "github.com/Mikubill/gofakes3/xml"`
`20`	`20`	`)`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,4 @@ func NewText(text string) Text {`
`53`	`53`	`return Text{`
`54`	`54`	`Body: text,`
`55`	`55`	`}`
`56`		`-}`
	`56`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1059,4 +1059,4 @@ func isEmptyValue(v reflect.Value) bool {`
`1059`	`1059`	`return v.IsNil()`
`1060`	`1060`	`}`
`1061`	`1061`	`return false`
`1062`		`-}`
	`1062`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2529,4 +2529,4 @@ func TestMarshalZeroValue(t *testing.T) {`
`2529`	`2529`	`if string(anotherXML) != proofXml {`
`2530`	`2530`	`t.Fatalf("unexpected unmarshal result, want %q but got %q", proofXml, anotherXML)`
`2531`	`2531`	`}`
`2532`		`-}`
	`2532`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func (d *Decoder) Decode(v interface{}) error {`
`145`	`145`	`// but also wants to defer to Unmarshal for some elements.`
`146`	`146`	`func (d Decoder) DecodeElement(v interface{}, start StartElement) error {`
`147`	`147`	`val := reflect.ValueOf(v)`
`148`		`- if val.Kind() != reflect.Pointer {`
	`148`	`+ if val.Kind() != reflect.Ptr {`
`149`	`149`	`return errors.New("non-pointer passed to Unmarshal")`
`150`	`150`	`}`
`151`	`151`
`@@ -768,4 +768,4 @@ func (d *Decoder) Skip() error {`
`768`	`768`	`depth--`
`769`	`769`	`}`
`770`	`770`	`}`
`771`		`-}`
	`771`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1125,4 +1125,4 @@ func TestCVE202228131(t *testing.T) {`
`1125`	`1125`	`} else if !errors.Is(err, errExeceededMaxUnmarshalDepth) {`
`1126`	`1126`	`t.Fatalf("Unmarshal unexpected error: got %q, want %q", err, errExeceededMaxUnmarshalDepth)`
`1127`	`1127`	`}`
`1128`		`-}`
	`1128`	`+}`