Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-17 13:25:24 +03:00
Code Issues Wiki Activity

Fixed vulnerabilities found by SonarCloud.

Browse source
This commit is contained in:
mikeller 2019-11-02 21:06:33 +13:00
parent 9bf2595cdc
commit 36f29108d9
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/js/msp.js
View file

@ -147,25 +147,20 @@ var MSP = {
clearListeners: function() { clearListeners: function() {
this.listeners = []; this.listeners = [];
}, },
send_message: function (code, data, callback_sent, callback_msp, callback_onerror) { send_message: function (code, data, callback_sent, callback_msp, doCallbackOnError) {
if (code === undefined) { if (code === undefined) {
debugger; return;
} }
var bufferOut,
bufView;
if (!callback_onerror) { let bufferOut;
var callbackOnError = false;
} else {
var callbackOnError = true;
}
// always reserve 6 bytes for protocol overhead ! // always reserve 6 bytes for protocol overhead !
if (data) { if (data) {
var size = data.length + 6, var size = data.length + 6,
checksum = 0; checksum = 0;
bufferOut = new ArrayBuffer(size); bufferOut = new ArrayBuffer(size);
bufView = new Uint8Array(bufferOut); let bufView = new Uint8Array(bufferOut);
bufView[0] = 36; // $ bufView[0] = 36; // $
bufView[1] = 77; // M bufView[1] = 77; // M
@ -184,7 +179,7 @@ var MSP = {
bufView[5 + data.length] = checksum; bufView[5 + data.length] = checksum;
} else { } else {
bufferOut = new ArrayBuffer(6); bufferOut = new ArrayBuffer(6);
bufView = new Uint8Array(bufferOut); let bufView = new Uint8Array(bufferOut);
bufView[0] = 36; // $ bufView[0] = 36; // $
bufView[1] = 77; // M bufView[1] = 77; // M
@ -194,7 +189,7 @@ var MSP = {
bufView[5] = bufView[3] ^ bufView[4]; // checksum bufView[5] = bufView[3] ^ bufView[4]; // checksum
} }
var obj = {'code': code, 'requestBuffer': bufferOut, 'callback': (callback_msp) ? callback_msp : false, 'timer': false, 'callbackOnError': callbackOnError}; var obj = {'code': code, 'requestBuffer': bufferOut, 'callback': callback_msp ? callback_msp : false, 'timer': false, 'callbackOnError': doCallbackOnError};
var requestExists = false; var requestExists = false;
for (var i = 0; i < MSP.callbacks.length; i++) { for (var i = 0; i < MSP.callbacks.length; i++) {
@ -219,13 +214,16 @@ var MSP = {
if (data || !requestExists) { if (data || !requestExists) {
serial.send(bufferOut, function (sendInfo) { serial.send(bufferOut, function (sendInfo) {
if (sendInfo.bytesSent == bufferOut.byteLength) { if (sendInfo.bytesSent == bufferOut.byteLength) {
if (callback_sent) callback_sent(); if (callback_sent) {
callback_sent();
}
} }
}); });
} }
return true; return true;
}, },
/** /**
* resolves: {command: code, data: data, length: message_length} * resolves: {command: code, data: data, length: message_length}
*/ */

3
src/js/msp/MSPHelper.js
View file

@ -69,9 +69,6 @@ MspHelper.prototype.process_data = function(dataHandler) {
var data = dataHandler.dataView; // DataView (allowing us to view arrayBuffer as struct/union) var data = dataHandler.dataView; // DataView (allowing us to view arrayBuffer as struct/union)
var code = dataHandler.code; var code = dataHandler.code;
if (code === 0) {
debugger;
}
var crcError = dataHandler.crcError; var crcError = dataHandler.crcError;
if (!crcError) { if (!crcError) {
if (!dataHandler.unsupported) switch (code) { if (!dataHandler.unsupported) switch (code) {