moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crash using VTX Client #284 

* Fix try/catch around JSON.parse()
* Ensure we don't try to replace on null/undefined no matter what
This commit is contained in:
Bryan Ashby 2020-06-01 19:22:15 -06:00
parent 10ec5d4271
commit 5b20c3ec38
No known key found for this signature in database
GPG Key ID: B49EB437951D2542
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/servers/chat/mrc_multiplexer.js
View File

@ -249,11 +249,10 @@ exports.getModule = class MrcModule extends ServerModule {
receiveFromClient(username, message) { receiveFromClient(username, message) {
try { try {
message = JSON.parse(message); message = JSON.parse(message);
this.sendToMrcServer(message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body);
} catch (e) { } catch (e) {
Log.debug({ server : 'MRC', user : username, message : message }, 'Dodgy message received from client'); Log.debug({ server : 'MRC', user : username, message : message }, 'Dodgy message received from client');
} }
this.sendToMrcServer(message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body);
} }
/** /**
@ -264,11 +263,11 @@ exports.getModule = class MrcModule extends ServerModule {
const line = [ const line = [
fromUser, fromUser,
this.boardName, this.boardName,
sanitiseRoomName(fromRoom), sanitiseRoomName(fromRoom || ''),
sanitiseName(toUser || ''), sanitiseName(toUser || ''),
sanitiseName(toSite || ''), sanitiseName(toSite || ''),
sanitiseRoomName(toRoom || ''), sanitiseRoomName(toRoom || ''),
sanitiseMessage(messageBody) sanitiseMessage(messageBody || '')
].join('~') + '~'; ].join('~') + '~';
// Log.debug({ server : 'MRC', data : line }, 'Sending data'); // Log.debug({ server : 'MRC', data : line }, 'Sending data');