qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-30 12:18:33 -06:00
Code Releases Activity

encoding/xml: Reset the parent stack before printing a chardata or comment field in a struct

Browse Source 
This CL resets the parent stack when printing a character or comment field struct.
In the case of XML elements, the previous parents stack must be considered. However,
charadata or comment fields can't be printed in other fields so it seems required to reset
the parent stack each time a chardata or comment field is printed.

Fixes #5072

Change-Id: I84f61c9bfce94133cd0c076c11211b9be5b4b1ac
Reviewed-on: https://go-review.googlesource.com/9910
Reviewed-by: Nigel Tao <nigeltao@golang.org>
Reviewed-by: roger peppe <rogpeppe@gmail.com>
This commit is contained in:
Hajime Hoshi 2015-05-10 04:22:11 +09:00 committed by roger peppe
parent 227fb116be
commit 2db587c029
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/encoding/xml/marshal.go
View File

@ -924,6 +924,9 @@ func (p *printer) marshalStruct(tinfo *typeInfo, val reflect.Value) error {
switch finfo.flags & fMode {
case fCharData:
if err := s.setParents(&noField, reflect.Value{}); err != nil {
return err
}
if vf.CanInterface() && vf.Type().Implements(textMarshalerType) {
data, err := vf.Interface().(encoding.TextMarshaler).MarshalText()
if err != nil {
@ -967,6 +970,9 @@ func (p *printer) marshalStruct(tinfo *typeInfo, val reflect.Value) error {
continue
case fComment:
if err := s.setParents(&noField, reflect.Value{}); err != nil {
return err
}
k := vf.Kind()
if !(k == reflect.String || k == reflect.Slice && vf.Type().Elem().Kind() == reflect.Uint8) {
return fmt.Errorf("xml: bad type for comment field of %s", val.Type())

18
src/encoding/xml/marshal_test.go
View File

@ -340,6 +340,16 @@ type OuterOuterStruct struct {
OuterStruct
}
type NestedAndChardata struct {
AB []string `xml:"A>B"`
Chardata string `xml:",chardata"`
}
type NestedAndComment struct {
AB []string `xml:"A>B"`
Comment string `xml:",comment"`
}
func ifaceptr(x interface{}) interface{} {
return &x
}
@ -995,6 +1005,14 @@ var marshalTests = []struct {
ExpectXML: `<outer xmlns="testns" int="10"></outer>`,
Value: &OuterOuterStruct{OuterStruct{IntAttr: 10}},
},
{
ExpectXML: `<NestedAndChardata><A><B></B><B></B></A>test</NestedAndChardata>`,
Value: &NestedAndChardata{AB: make([]string, 2), Chardata: "test"},
},
{
ExpectXML: `<NestedAndComment><A><B></B><B></B></A><!--test--></NestedAndComment>`,
Value: &NestedAndComment{AB: make([]string, 2), Comment: "test"},
},
}
func TestMarshal(t *testing.T) {