From 332413bcaa7e1c810f236239474d997eb5d1aa43 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Sat, 26 Sep 2015 10:25:00 +0800 Subject: Fixed if using splice in loop should always decrement index or might out of array range --- lib/realtime.js | 12 +++++++++--- public/js/history.js | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/realtime.js b/lib/realtime.js index 09da1c8c..23464099 100644 --- a/lib/realtime.js +++ b/lib/realtime.js @@ -264,8 +264,10 @@ function finishConnection(socket, note, user) { //clear finished socket in queue for (var i = 0; i < connectionSocketQueue.length; i++) { - if (!connectionSocketQueue[i] || connectionSocketQueue[i].id == socket.id) + if (!connectionSocketQueue[i] || connectionSocketQueue[i].id == socket.id) { connectionSocketQueue.splice(i, 1); + i--; + } } //seek for next socket isConnectionBusy = false; @@ -302,8 +304,10 @@ function startConnection(socket) { socket.disconnect(true); //clear err socket in queue for (var i = 0; i < connectionSocketQueue.length; i++) { - if (!connectionSocketQueue[i] || connectionSocketQueue[i].id == socket.id) + if (!connectionSocketQueue[i] || connectionSocketQueue[i].id == socket.id) { connectionSocketQueue.splice(i, 1); + i--; + } } isConnectionBusy = false; return logger.error(err); @@ -390,8 +394,10 @@ function disconnect(socket) { //clear finished socket in queue for (var i = 0; i < disconnectSocketQueue.length; i++) { - if (!disconnectSocketQueue[i] || disconnectSocketQueue[i].id == socket.id) + if (!disconnectSocketQueue[i] || disconnectSocketQueue[i].id == socket.id) { disconnectSocketQueue.splice(i, 1); + i--; + } } //seek for next socket isDisconnectBusy = false; diff --git a/public/js/history.js b/public/js/history.js index 10ab932f..82c145da 100644 --- a/public/js/history.js +++ b/public/js/history.js @@ -123,8 +123,10 @@ function addHistory(id, text, time, tags, notehistory) { function removeHistory(id, notehistory) { for (var i = 0; i < notehistory.length; i++) { - if (notehistory[i].id == id) + if (notehistory[i].id == id) { notehistory.splice(i, 1); + i--; + } } return notehistory; } -- cgit v1.2.3