Commit f549391

committed

Add end of stream validation to handshake

1 parent 175b6de commit f549391Copy full SHA for f549391

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -776,10 +776,20 @@ private void verifyServerHandshake(InputStream inputStream, String secWebSocketK`
`776`	`776`
`777`	`777`	`outer:do {`
`778`	`778`	`inner:do {`
`779`		`- char c = (char) inputStream.read();`
	`779`	`+ int result = inputStream.read();`
	`780`	`+ if (result == -1) {`
	`781`	`+ throw new IOException("Unexpected end of stream");`
	`782`	`+ }`
	`783`	`+`
	`784`	`+ char c = (char) result;`
`780`	`785`	`bytesRead++;`
`781`	`786`	`if (c == '\r') {`
`782`		`- c = (char) inputStream.read();`
	`787`	`+ result = inputStream.read();`
	`788`	`+ if (result == -1) {`
	`789`	`+ throw new IOException("Unexpected end of stream");`
	`790`	`+ }`
	`791`	`+`
	`792`	`+ c = (char) result;`
`783`	`793`	`bytesRead++;`
`784`	`794`	`if (c == '\n') {`
`785`	`795`	`if (lastLineBreak) {`

Comments

(0)