mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 23:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change getLargest/getSmallest to use a for loop.

Browse source 
Math.max() and Math.min() were exceeding call stack size
This commit is contained in:
j433866 2019-06-03 13:48:49 +01:00
parent bcaefe39aa
commit 4a0f62b636
1 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/web/InputWorker.mjs
View file

@ -287,23 +287,36 @@ self.getInputProgress = function(inputNum) {
/** /**
* Gets the largest inputNum of all the inputs * Gets the largest inputNum of all the inputs
* *
* @param {string[]} inputNums - The numbers to find the largest of
* @returns {number} * @returns {number}
*/ */
self.getLargestInputNum = function() { self.getLargestInputNum = function(inputNums) {
const inputNums = Object.keys(self.inputs); let max = -1;
if (inputNums.length === 0) return -1; for (let i = 0; i < inputNums.length; i++) {
return Math.max(...inputNums); // Object.keys() returns a string array, so parseInt here
const num = parseInt(inputNums[i], 10);
if (num > max) max = num;
}
return max;
}; };
/** /**
* Gets the smallest inputNum of all the inputs * Gets the smallest inputNum of all the inputs
* *
* @param {string[]} inputNums - The numbers to find the smallest of
* @returns {number} * @returns {number}
*/ */
self.getSmallestInputNum = function() { self.getSmallestInputNum = function(inputNums) {
const inputNums = Object.keys(self.inputs); let min = Number.MAX_SAFE_INTEGER;
if (inputNums.length === 0) return -1; for (let i = 0; i < inputNums.length; i++) {
return Math.min(...inputNums); const num = parseInt(inputNums[i], 10);
if (num < min) min = num;
}
// Assume we don't have this many tabs!
if (min === Number.MAX_SAFE_INTEGER) return -1;
return min;
}; };
/** /**
@ -315,7 +328,7 @@ self.getSmallestInputNum = function() {
self.getPreviousInputNum = function(inputNum) { self.getPreviousInputNum = function(inputNum) {
const inputNums = Object.keys(self.inputs); const inputNums = Object.keys(self.inputs);
if (inputNums.length === 0) return -1; if (inputNums.length === 0) return -1;
let num = Math.min(...inputNums); let num = self.getSmallestInputNum(inputNums);
for (let i = 0; i < inputNums.length; i++) { for (let i = 0; i < inputNums.length; i++) {
const iNum = parseInt(inputNums[i], 10); const iNum = parseInt(inputNums[i], 10);
if (iNum < inputNum) { if (iNum < inputNum) {
@ -335,7 +348,7 @@ self.getPreviousInputNum = function(inputNum) {
*/ */
self.getNextInputNum = function(inputNum) { self.getNextInputNum = function(inputNum) {
const inputNums = Object.keys(self.inputs); const inputNums = Object.keys(self.inputs);
let num = Math.max(...inputNums); let num = self.getLargestInputNum(inputNums);
for (let i = 0; i < inputNums.length; i++) { for (let i = 0; i < inputNums.length; i++) {
const iNum = parseInt(inputNums[i], 10); const iNum = parseInt(inputNums[i], 10);
if (iNum > inputNum) { if (iNum > inputNum) {
@ -466,9 +479,11 @@ self.setInput = function(inputData) {
* @param {string} direction - The direction to search for inputNums in. Either "left" or "right" * @param {string} direction - The direction to search for inputNums in. Either "left" or "right"
*/ */
self.refreshTabs = function(inputNum, direction) { self.refreshTabs = function(inputNum, direction) {
const nums = self.getNearbyNums(inputNum, direction); const nums = self.getNearbyNums(inputNum, direction),
const tabsLeft = (self.getSmallestInputNum() !== nums[0]); inputNums = Object.keys(self.inputs),
const tabsRight = (self.getLargestInputNum() !== nums[nums.length - 1]); tabsLeft = (self.getSmallestInputNum(inputNums) !== nums[0]),
tabsRight = (self.getLargestInputNum(inputNums) !== nums[nums.length - 1]);
self.postMessage({ self.postMessage({
action: "refreshTabs", action: "refreshTabs",
data: { data: {