Commit e2016ac

committed

Merge branch 'dev'

2 parents b4e4f4f + 454aee8 commit e2016acCopy full SHA for e2016ac

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ const (`
`42`	`42`	`// Conn provides a wrapper around the browser WebSocket API.`
`43`	`43`	`type Conn struct {`
`44`	`44`	`noCopy noCopy`
`45`		`- ws wsjs.WebSocket`
	`45`	`+ ws wsjs.WebSocket`
`46`	`46`
`47`	`47`	`// read limit for a message in bytes.`
`48`	`48`	`msgReadLimit xsync.Int64`
`@@ -138,7 +138,8 @@ func (c *Conn) Read(ctx context.Context) (MessageType, []byte, error) {`
`138`	`138`	`if err != nil {`
`139`	`139`	`return 0, nil, fmt.Errorf("failed to read: %w", err)`
`140`	`140`	`}`
`141`		`- if int64(len(p)) > c.msgReadLimit.Load() {`
	`141`	`+ readLimit := c.msgReadLimit.Load()`
	`142`	`+ if readLimit >= 0 && int64(len(p)) > readLimit {`
`142`	`143`	`err := fmt.Errorf("read limited at %v bytes", c.msgReadLimit.Load())`
`143`	`144`	`c.Close(StatusMessageTooBig, err.Error())`
`144`	`145`	`return 0, nil, err`

Comments

(0)