mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-13 18:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

common/test/client: Don't panic on EOF in CanonicalJSONInput

Browse source
This commit is contained in:
Robert Swain 2017-06-08 10:39:26 +02:00
parent 2b166c0ca8
commit 9673792b48
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/github.com/matrix-org/dendrite/common/test/client.go
View file

@ -16,6 +16,7 @@ package test
import ( import (
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"sync" "sync"
@ -58,7 +59,7 @@ func (r *LastRequestErr) Get() error {
func CanonicalJSONInput(jsonData []string) []string { func CanonicalJSONInput(jsonData []string) []string {
for i := range jsonData { for i := range jsonData {
jsonBytes, err := gomatrixserverlib.CanonicalJSON([]byte(jsonData[i])) jsonBytes, err := gomatrixserverlib.CanonicalJSON([]byte(jsonData[i]))
if err != nil { if err != nil && err != io.EOF {
panic(err) panic(err)
} }
jsonData[i] = string(jsonBytes) jsonData[i] = string(jsonBytes)