Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

bugfix/bogus-quit-detected #26

Merged
stephen-palmer merged 6 commits into from
Apr 13, 2018
Merged

bugfix/bogus-quit-detected #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c5eb20
- Fixed bug where a ‘q’ character is mis-interpreted as a quit comman…
stephen-palmer Apr 13, 2018
38e87fc
Merge pull request #2 from Unity-Technologies/master
stephen-palmer Apr 13, 2018
59d07c5
clarify code by using charCodeAt instead of the value
stephen-palmer Apr 13, 2018
49cde12
Add an additional ‘q’ char to the beginning of GUID
stephen-palmer Apr 13, 2018
f107896
simplifying an expression
stephen-palmer Apr 13, 2018
6fa8310
Merge pull request #3 from stephen-palmer/bugfix/bogus-quit-detected
stephen-palmer Apr 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/server/client_stream_processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class ClientStreamProcessor extends Transform {
if(!fillBufferWithData()) {

// Quit?
if (data[data.length - 1] === CMD_QUIT) {
if (!readState.didParseCmd && data[data.length - 1] === CMD_QUIT) {
this.push('q');
}

Expand Down
5 changes: 5 additions & 0 deletions test/protocol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ describe("Protocol", () => {

tests.forEach(function (test) {
it(`should store ${test.ext} data with a (${test.cmd}) command (client write packet size = ${test.packetSize})`, () => {
// Insert 'q' character ('Quit' command) into the GUID, to catch subtle protocol errors when packet size is 1
if(test.packetSize === 1) {
test.data.guid[0] = test.data.guid[test.data.guid.length - 1] = 'q'.charCodeAt(0);
}

const buf = Buffer.from(
encodeCommand(cmd.transactionStart, test.data.guid, test.data.hash) +
encodeCommand(test.cmd, null, null, test.data[test.ext]) +
Expand Down