Commitb0e6400

committed

fix: properly detect plain objects

The typeof check was not sufficient, as it also matches arrays andnulls.

1 parentd9db473 commitb0e6400Copy full SHA for b0e6400

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,11 @@ export class Encoder {`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
	`134`	`+// see https://stackoverflow.com/questions/8511281/check-if-a-value-is-an-object-in-javascript`
	`135`	`+functionisObject(value:any):boolean{`
	`136`	`+returnObject.prototype.toString.call(value)==="[object Object]";`
	`137`	`+}`
	`138`	`+`
`134`	`139`	`interfaceDecoderReservedEvents{`
`135`	`140`	`decoded:(packet:Packet)=>void;`
`136`	`141`	`}`
`@@ -280,11 +285,11 @@ export class Decoder extends Emitter<{}, {}, DecoderReservedEvents> {`
`280`	`285`	`privatestaticisPayloadValid(type:PacketType,payload:any):boolean{`
`281`	`286`	`switch(type){`
`282`	`287`	`casePacketType.CONNECT:`
`283`		`-returntypeofpayload==="object";`
	`288`	`+returnisObject(payload);`
`284`	`289`	`casePacketType.DISCONNECT:`
`285`	`290`	`returnpayload===undefined;`
`286`	`291`	`casePacketType.CONNECT_ERROR:`
`287`		`-returntypeofpayload==="string"\|\|typeofpayload==="object";`
	`292`	`+returntypeofpayload==="string"\|\|isObject(payload);`
`288`	`293`	`casePacketType.EVENT:`
`289`	`294`	`casePacketType.BINARY_EVENT:`
`290`	`295`	`return(`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ describe("socket.io-parser", () => {`
`115`	`115`
`116`	`116`	`isInvalidPayload('442["some","data"');`
`117`	`117`	`isInvalidPayload('0/admin,"invalid"');`
	`118`	`+isInvalidPayload("0[]");`
`118`	`119`	`isInvalidPayload("1/admin,{}");`
`119`	`120`	`isInvalidPayload('2/admin,"invalid');`
`120`	`121`	`isInvalidPayload("2/admin,{}");`

Comments

(0)