github/socket.io
1
1
Fork 0
mirror of https://github.com/socketio/socket.io.git synced 2026-04-30 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Fix double utf8 encoding for payloads (#81)

Browse Source
This commit is contained in:
Damien Arrachequesne
2016-12-21 09:15:07 +01:00
committed by GitHub
parent 339d367267
commit 181acef657
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/browser.js
View File

@@ -331,7 +331,7 @@ exports.encodePayload = function (packets, supportsBinary, callback) {
}
function encodeOne(packet, doneCallback) {
exports.encodePacket(packet, !isBinary ? false : supportsBinary, true, function(message) {
exports.encodePacket(packet, !isBinary ? false : supportsBinary, false, function(message) {
doneCallback(null, setLengthHeader(message));
});
}
@@ -407,7 +407,7 @@ exports.decodePayload = function (data, binaryType, callback) {
}
if (msg.length) {
packet = exports.decodePacket(msg, binaryType, true);
packet = exports.decodePacket(msg, binaryType, false);
if (err.type == packet.type && err.data == packet.data) {
// parser error in individual packet - ignoring payload

4
lib/index.js
View File

@@ -226,7 +226,7 @@ exports.encodePayload = function (packets, supportsBinary, callback) {
}
function encodeOne(packet, doneCallback) {
exports.encodePacket(packet, supportsBinary, true, function(message) {
exports.encodePacket(packet, supportsBinary, false, function(message) {
doneCallback(null, setLengthHeader(message));
});
}
@@ -302,7 +302,7 @@ exports.decodePayload = function (data, binaryType, callback) {
}
if (msg.length) {
packet = exports.decodePacket(msg, binaryType, true);
packet = exports.decodePacket(msg, binaryType, false);
if (err.type == packet.type && err.data == packet.data) {
// parser error in individual packet - ignoring payload

13
test/parser.js
View File

@@ -193,6 +193,12 @@ module.exports = function(parser) {
});
});
});
it('should not utf8 encode when dealing with strings only', function() {
encPayload([{ type: 'message', data: '€€€' }, { type: 'message', data: 'α' }], function(data) {
expect(data).to.eql('4:4€€€2:4α');
});
});
});
describe('decoding error handling', function () {
@@ -255,13 +261,6 @@ module.exports = function(parser) {
});
});
it('should err on invalid utf8', function () {
decPayload('2:4\uffff', function (packet, index, total) {
var isLast = index + 1 == total;
expect(packet).to.eql(err);
expect(isLast).to.eql(true);
});
});
});
});
});