fix(golang): make sure xml.Encoder is closed (#16141)

This commit is contained in:
Adam Shannon 2023-07-26 02:48:46 -05:00 committed by GitHub
parent 30c38ed7ad
commit 90eacb685c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions

View File

@ -609,7 +609,11 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
} else if jsonCheck.MatchString(contentType) { } else if jsonCheck.MatchString(contentType) {
err = json.NewEncoder(bodyBuf).Encode(body) err = json.NewEncoder(bodyBuf).Encode(body)
} else if xmlCheck.MatchString(contentType) { } else if xmlCheck.MatchString(contentType) {
err = xml.NewEncoder(bodyBuf).Encode(body) var bs []byte
bs, err = xml.Marshal(body)
if err == nil {
bodyBuf.Write(bs)
}
} }
if err != nil { if err != nil {

View File

@ -556,7 +556,11 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
} else if jsonCheck.MatchString(contentType) { } else if jsonCheck.MatchString(contentType) {
err = json.NewEncoder(bodyBuf).Encode(body) err = json.NewEncoder(bodyBuf).Encode(body)
} else if xmlCheck.MatchString(contentType) { } else if xmlCheck.MatchString(contentType) {
err = xml.NewEncoder(bodyBuf).Encode(body) var bs []byte
bs, err = xml.Marshal(body)
if err == nil {
bodyBuf.Write(bs)
}
} }
if err != nil { if err != nil {

View File

@ -524,7 +524,11 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
} else if jsonCheck.MatchString(contentType) { } else if jsonCheck.MatchString(contentType) {
err = json.NewEncoder(bodyBuf).Encode(body) err = json.NewEncoder(bodyBuf).Encode(body)
} else if xmlCheck.MatchString(contentType) { } else if xmlCheck.MatchString(contentType) {
err = xml.NewEncoder(bodyBuf).Encode(body) var bs []byte
bs, err = xml.Marshal(body)
if err == nil {
bodyBuf.Write(bs)
}
} }
if err != nil { if err != nil {

View File

@ -574,7 +574,11 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
} else if jsonCheck.MatchString(contentType) { } else if jsonCheck.MatchString(contentType) {
err = json.NewEncoder(bodyBuf).Encode(body) err = json.NewEncoder(bodyBuf).Encode(body)
} else if xmlCheck.MatchString(contentType) { } else if xmlCheck.MatchString(contentType) {
err = xml.NewEncoder(bodyBuf).Encode(body) var bs []byte
bs, err = xml.Marshal(body)
if err == nil {
bodyBuf.Write(bs)
}
} }
if err != nil { if err != nil {