fix(core): change callbacks to object to fix memory leak

Tencent · Apr 18, 2022 · 9ea52da · 9ea52da
1 parent d44d880
commit 9ea52da
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/core/js/bridge/ios/native2js.js b/core/js/bridge/ios/native2js.js
@@ -22,14 +22,12 @@ __fbBatchedBridge.invokeCallbackAndReturnFlushedQueue = (cbID, args) => {
 
 __fbBatchedBridge.__invokeCallback = (cbID, args) => {
   const callback = __GLOBAL__._callbacks[cbID];
-  if (!callback) {
-    return;
-  }
+  if (!callback) return;
 
   if (!__GLOBAL__._notDeleteCallbackIds[cbID & ~1]
      && !__GLOBAL__._notDeleteCallbackIds[cbID | 1]) {
-    __GLOBAL__._callbacks[cbID & ~1] = null;
-    __GLOBAL__._callbacks[cbID | 1] = null;
+    delete __GLOBAL__._callbacks[cbID & ~1];
+    delete __GLOBAL__._callbacks[cbID | 1];
   }
 
   if (args && args.length > 1 && (args[0] === null || args[0] === undefined)) {

diff --git a/core/js/global/ios/global.js b/core/js/global/ios/global.js
@@ -14,7 +14,7 @@ __GLOBAL__.requestAnimationFrameQueue = {};
 __GLOBAL__.destroyInstanceList = {};
 __GLOBAL__._callID = 0;
 __GLOBAL__._callbackID = 0;
-__GLOBAL__._callbacks = [];
+__GLOBAL__._callbacks = {};
 __GLOBAL__._notDeleteCallbackIds = {};
 __GLOBAL__._queue = [[], [], [], __GLOBAL__._callID];
 
@@ -58,7 +58,6 @@ __GLOBAL__.enqueueNativeCall = (moduleID, methodID, params, onFail, onSucc) => {
   if (onFail || onSucc) {
     if (typeof params === 'object' && params.length > 0 && typeof params[0] === 'object' && params[0].notDelete) {
       params.shift();
-
       __GLOBAL__._notDeleteCallbackIds[__GLOBAL__._callbackID] = true;
     }