diff --git a/native/cocos/bindings/jswrapper/MappingUtils.cpp b/native/cocos/bindings/jswrapper/MappingUtils.cpp index 0a2aae583b..bc0562a762 100644 --- a/native/cocos/bindings/jswrapper/MappingUtils.cpp +++ b/native/cocos/bindings/jswrapper/MappingUtils.cpp @@ -30,12 +30,14 @@ namespace se { // NativePtrToObjectMap -NativePtrToObjectMap::Map *NativePtrToObjectMap::__nativePtrToObjectMap = nullptr; +NativePtrToObjectMap::Map *NativePtrToObjectMap::__nativePtrToObjectMap = nullptr; // NOLINT +bool NativePtrToObjectMap::__isValid = false; // NOLINT bool NativePtrToObjectMap::init() { - if (__nativePtrToObjectMap == nullptr) + if (__nativePtrToObjectMap == nullptr) { __nativePtrToObjectMap = ccnew NativePtrToObjectMap::Map(); - + } + __isValid = true; return __nativePtrToObjectMap != nullptr; } @@ -44,6 +46,11 @@ void NativePtrToObjectMap::destroy() { delete __nativePtrToObjectMap; __nativePtrToObjectMap = nullptr; } + __isValid = false; +} + +bool NativePtrToObjectMap::isValid() { + return __isValid; } void NativePtrToObjectMap::emplace(void *nativeObj, Object *seObj) { diff --git a/native/cocos/bindings/jswrapper/MappingUtils.h b/native/cocos/bindings/jswrapper/MappingUtils.h index 13d3b67e1c..b35890713d 100644 --- a/native/cocos/bindings/jswrapper/MappingUtils.h +++ b/native/cocos/bindings/jswrapper/MappingUtils.h @@ -40,6 +40,8 @@ public: static bool init(); static void destroy(); + static bool isValid(); + static Map::iterator find(void *nativeObj); static Map::iterator erase(Map::iterator iter); static void erase(void *nativeObj); @@ -53,7 +55,8 @@ public: private: static void emplace(void *nativeObj, Object *seObj); - static Map *__nativePtrToObjectMap; + static Map *__nativePtrToObjectMap; // NOLINT + static bool __isValid; // NOLINT friend class Object; }; diff --git a/native/cocos/bindings/manual/jsb_dragonbones_manual.cpp b/native/cocos/bindings/manual/jsb_dragonbones_manual.cpp index 9440721564..bdd9edcad9 100644 --- a/native/cocos/bindings/manual/jsb_dragonbones_manual.cpp +++ b/native/cocos/bindings/manual/jsb_dragonbones_manual.cpp @@ -431,9 +431,10 @@ bool register_all_dragonbones_manual(se::Object *obj) { dragonBones::BaseObject::setObjectRecycleOrDestroyCallback([](dragonBones::BaseObject *obj, int type) { //ccstd::string typeName = typeid(*obj).name(); - + if (!se::NativePtrToObjectMap::isValid()) { + return; + } se::Object *seObj = nullptr; - auto iter = se::NativePtrToObjectMap::find(obj); if (iter != se::NativePtrToObjectMap::end()) { // Save se::Object pointer for being used in cleanup method. diff --git a/native/cocos/bindings/manual/jsb_spine_manual.cpp b/native/cocos/bindings/manual/jsb_spine_manual.cpp index e24d1d09e0..772b4504b7 100644 --- a/native/cocos/bindings/manual/jsb_spine_manual.cpp +++ b/native/cocos/bindings/manual/jsb_spine_manual.cpp @@ -230,6 +230,9 @@ bool register_all_spine_manual(se::Object *obj) { ns->defineFunction("disposeSkeletonData", _SE(js_register_spine_disposeSkeletonData)); spine::setSpineObjectDisposeCallback([](void *spineObj) { + if (!se::NativePtrToObjectMap::isValid()) { + return; + } // Support Native Spine fo Creator V3.0 se::Object *seObj = nullptr; auto iter = se::NativePtrToObjectMap::find(spineObj);