From c9adca15b8292acdffa8112f6a140646083dabd1 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sat, 27 May 2017 11:20:30 +0800 Subject: [PATCH 1/2] More secured Scheduler with target id assert --- DebugInfos.js | 15 ++++++----- cocos2d/core/CCScheduler.js | 53 +++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/DebugInfos.js b/DebugInfos.js index fc0d9ba179..889d3c36ac 100644 --- a/DebugInfos.js +++ b/DebugInfos.js @@ -49,16 +49,17 @@ if (CC_DEV) { "1403": "Sorry, cc.audioEngine.willPlayMusic is removed.", //willPlayMusicError "1404": "cc.spriteFrameCache is removed, please use cc.loader to load and cache sprite frames of atlas format.", //Scheduler: 1500 - "1500": "CCSheduler#scheduleCallback. Callback already scheduled. Updating interval from:%s to %s", //scheduleCallbackForTarget - "1501": "cc.scheduler.scheduleCallbackForTarget(): callback_fn should be non-null.", //scheduleCallbackForTarget_2 - "1502": "cc.scheduler.scheduleCallbackForTarget(): target should be non-null.", //scheduleCallbackForTarget_3 - "1503": "cc.Scheduler.pauseTarget():target should be non-null", //pauseTarget - "1504": "cc.Scheduler.resumeTarget():target should be non-null", //resumeTarget - "1505": "cc.Scheduler.isTargetPaused():target should be non-null", //isTargetPaused + "1500": "cc.Scheduler#schedule: Callback already scheduled. Updating interval from:%s to %s", //scheduleCallbackForTarget + "1501": "cc.Scheduler#scheduleCallbackForTarget(): callback_fn should be non-null.", //scheduleCallbackForTarget_2 + "1502": "cc.Scheduler#scheduleCallbackForTarget(): target should be non-null.", //scheduleCallbackForTarget_3 + "1503": "cc.Scheduler#pauseTarget():target should be non-null", //pauseTarget + "1504": "cc.Scheduler#resumeTarget():target should be non-null", //resumeTarget + "1505": "cc.Scheduler#isTargetPaused():target should be non-null", //isTargetPaused "1506": "warning: you CANNOT change update priority in scheduled function", //_schedulePerFrame - "1507": "CCScheduler#scheduleSelector. Selector already scheduled. Updating interval from: %.4f to %.4f", //schedule + "1507": "cc.Scheduler#scheduleSelector: Selector already scheduled. Updating interval from: %.4f to %.4f", //schedule "1508": "Argument callback must not be empty", //isScheduled "1509": "Argument target must be non-nullptr", //isScheduled + "1510": "cc.Scheduler: Illegal target which doesn't have uuid or instanceId", //Node: 1600 "1600": "getZOrder is deprecated. Please use getLocalZOrder instead.", //getZOrder "1601": "setZOrder is deprecated. Please use setLocalZOrder instead.", //setZOrder diff --git a/cocos2d/core/CCScheduler.js b/cocos2d/core/CCScheduler.js index 8efda2ccaa..f817f9d45a 100644 --- a/cocos2d/core/CCScheduler.js +++ b/cocos2d/core/CCScheduler.js @@ -543,8 +543,8 @@ cc.Scheduler = cc._Class.extend({ cc.assertID(target, 1502); var instanceId = getTargetId(target); + cc.assertID(target, 1510); var element = this._hashForTimers[instanceId]; - if (!element) { // Is this the 1st element ? Then set the pause level to all the callback_fns of this target element = HashTimerEntry.get(null, target, 0, null, null, paused); @@ -588,7 +588,9 @@ cc.Scheduler = cc._Class.extend({ * @param {Function} updateFunc */ scheduleUpdate: function(target, priority, paused, updateFunc) { - var hashElement = this._hashForUpdates[getTargetId(target)]; + var targetId = getTargetId(target); + cc.assertID(target, 1510); + var hashElement = this._hashForUpdates[targetId]; if (hashElement && hashElement.entry){ // check if priority has changed if (hashElement.entry.priority !== priority){ @@ -623,7 +625,7 @@ cc.Scheduler = cc._Class.extend({ } //update hash entry for quick access - this._hashForUpdates[getTargetId(target)] = HashUpdateEntry.get(ppList, listElement, target, null); + this._hashForUpdates[targetId] = HashUpdateEntry.get(ppList, listElement, target, null); }, /** @@ -643,8 +645,10 @@ cc.Scheduler = cc._Class.extend({ // explicity handle nil arguments when removing an object if (!target || !callback) return; + var targetId = getTargetId(target); + cc.assertID(target, 1510); - var self = this, element = self._hashForTimers[getTargetId(target)]; + var self = this, element = self._hashForTimers[targetId]; if (element) { var timers = element.timers; for(var i = 0, li = timers.length; i < li; i++){ @@ -682,9 +686,10 @@ cc.Scheduler = cc._Class.extend({ unscheduleUpdate: function (target) { if (!target) return; + var targetId = getTargetId(target); + cc.assertID(target, 1510); - var element = this._hashForUpdates[getTargetId(target)]; - + var element = this._hashForUpdates[targetId]; if (element) { if (this._updateHashLocked) { element.entry.markedForDeletion = true; @@ -707,10 +712,11 @@ cc.Scheduler = cc._Class.extend({ if (!target){ return; } + var targetId = getTargetId(target); + cc.assertID(target, 1510); // Custom Selectors - var element = this._hashForTimers[getTargetId(target)]; - + var element = this._hashForTimers[targetId]; if (element) { var timers = element.timers; if (timers.indexOf(element.currentTimer) > -1 && @@ -813,9 +819,10 @@ cc.Scheduler = cc._Class.extend({ //selector, target cc.assertID(callback, 1508); cc.assertID(target, 1509); - - var instanceId = getTargetId(target); - var element = this._hashForTimers[instanceId]; + var targetId = getTargetId(target); + cc.assertID(target, 1510); + + var element = this._hashForTimers[targetId]; if (!element) { return false; @@ -942,19 +949,19 @@ cc.Scheduler = cc._Class.extend({ * @param {Object} target */ pauseTarget: function (target) { - cc.assertID(target, 1503); + var targetId = getTargetId(target); + cc.assertID(target, 1510); //customer selectors var self = this, - instanceId = getTargetId(target), - element = self._hashForTimers[instanceId]; + element = self._hashForTimers[targetId]; if (element) { element.paused = true; } //update callback - var elementUpdate = self._hashForUpdates[instanceId]; + var elementUpdate = self._hashForUpdates[targetId]; if (elementUpdate) { elementUpdate.entry.paused = true; } @@ -973,20 +980,20 @@ cc.Scheduler = cc._Class.extend({ * @param {Object} target */ resumeTarget: function (target) { - cc.assertID(target, 1504); + var targetId = getTargetId(target); + cc.assertID(target, 1510); // custom selectors var self = this, - instanceId = getTargetId(target), - element = self._hashForTimers[instanceId]; + element = self._hashForTimers[targetId]; if (element) { element.paused = false; } //update callback - var elementUpdate = self._hashForUpdates[instanceId]; + var elementUpdate = self._hashForUpdates[targetId]; if (elementUpdate) { elementUpdate.entry.paused = false; @@ -1001,16 +1008,16 @@ cc.Scheduler = cc._Class.extend({ * @return {Boolean} */ isTargetPaused: function (target) { - cc.assertID(target, 1505); + var targetId = getTargetId(target); + cc.assertID(target, 1510); // Custom selectors - var instanceId = getTargetId(target), - element = this._hashForTimers[instanceId]; + var element = this._hashForTimers[targetId]; if (element) { return element.paused; } - var elementUpdate = this._hashForUpdates[instanceId]; + var elementUpdate = this._hashForUpdates[targetId]; if (elementUpdate) { return elementUpdate.entry.paused; } From ce15b4f738b39ec18fd0a2cf3e539ab010486b1a Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sat, 27 May 2017 11:26:14 +0800 Subject: [PATCH 2/2] fix typo --- cocos2d/core/CCScheduler.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cocos2d/core/CCScheduler.js b/cocos2d/core/CCScheduler.js index f817f9d45a..04aecfeeff 100644 --- a/cocos2d/core/CCScheduler.js +++ b/cocos2d/core/CCScheduler.js @@ -543,7 +543,7 @@ cc.Scheduler = cc._Class.extend({ cc.assertID(target, 1502); var instanceId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(instanceId, 1510); var element = this._hashForTimers[instanceId]; if (!element) { // Is this the 1st element ? Then set the pause level to all the callback_fns of this target @@ -589,7 +589,7 @@ cc.Scheduler = cc._Class.extend({ */ scheduleUpdate: function(target, priority, paused, updateFunc) { var targetId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(targetId, 1510); var hashElement = this._hashForUpdates[targetId]; if (hashElement && hashElement.entry){ // check if priority has changed @@ -646,7 +646,7 @@ cc.Scheduler = cc._Class.extend({ if (!target || !callback) return; var targetId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(targetId, 1510); var self = this, element = self._hashForTimers[targetId]; if (element) { @@ -687,7 +687,7 @@ cc.Scheduler = cc._Class.extend({ if (!target) return; var targetId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(targetId, 1510); var element = this._hashForUpdates[targetId]; if (element) { @@ -713,7 +713,7 @@ cc.Scheduler = cc._Class.extend({ return; } var targetId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(targetId, 1510); // Custom Selectors var element = this._hashForTimers[targetId]; @@ -820,7 +820,7 @@ cc.Scheduler = cc._Class.extend({ cc.assertID(callback, 1508); cc.assertID(target, 1509); var targetId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(targetId, 1510); var element = this._hashForTimers[targetId]; @@ -951,7 +951,7 @@ cc.Scheduler = cc._Class.extend({ pauseTarget: function (target) { cc.assertID(target, 1503); var targetId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(targetId, 1510); //customer selectors var self = this, @@ -982,7 +982,7 @@ cc.Scheduler = cc._Class.extend({ resumeTarget: function (target) { cc.assertID(target, 1504); var targetId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(targetId, 1510); // custom selectors var self = this, @@ -1010,7 +1010,7 @@ cc.Scheduler = cc._Class.extend({ isTargetPaused: function (target) { cc.assertID(target, 1505); var targetId = getTargetId(target); - cc.assertID(target, 1510); + cc.assertID(targetId, 1510); // Custom selectors var element = this._hashForTimers[targetId];