From b97be2db0985293e39b77c7eb8ce7649bc25d99a Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 24 Jul 2017 11:47:49 +0800 Subject: [PATCH] Event's subclass should not be allocated on stack. --- native/cocos/base/CCConfiguration.cpp | 2 +- native/cocos/base/CCDirector.cpp | 12 ++++++------ native/cocos/base/CCEventAcceleration.h | 1 + native/cocos/base/CCEventCustom.h | 2 ++ native/cocos/base/CCEventFocus.h | 2 ++ native/cocos/base/CCEventKeyboard.h | 2 ++ native/cocos/base/CCEventMouse.h | 2 ++ native/cocos/base/CCEventTouch.h | 2 ++ native/cocos/platform/ios/CCDevice-ios.mm | 5 +++-- 9 files changed, 21 insertions(+), 9 deletions(-) diff --git a/native/cocos/base/CCConfiguration.cpp b/native/cocos/base/CCConfiguration.cpp index 9501103d91..3e0ef2b3c1 100644 --- a/native/cocos/base/CCConfiguration.cpp +++ b/native/cocos/base/CCConfiguration.cpp @@ -90,7 +90,7 @@ bool Configuration::init() Configuration::~Configuration() { - CC_SAFE_DELETE(_loadedEvent); + CC_SAFE_RELEASE(_loadedEvent); } std::string Configuration::getInfo() const diff --git a/native/cocos/base/CCDirector.cpp b/native/cocos/base/CCDirector.cpp index 6bdc4da445..cb0131e072 100644 --- a/native/cocos/base/CCDirector.cpp +++ b/native/cocos/base/CCDirector.cpp @@ -192,12 +192,12 @@ Director::~Director(void) CC_SAFE_RELEASE(_actionManager); CC_SAFE_DELETE(_defaultFBO); - delete _eventBeforeUpdate; - delete _eventAfterUpdate; - delete _eventAfterDraw; - delete _eventAfterVisit; - delete _eventProjectionChanged; - delete _eventResetDirector; + CC_SAFE_RELEASE(_eventBeforeUpdate); + CC_SAFE_RELEASE(_eventAfterUpdate); + CC_SAFE_RELEASE(_eventAfterDraw); + CC_SAFE_RELEASE(_eventAfterVisit); + CC_SAFE_RELEASE(_eventProjectionChanged); + CC_SAFE_RELEASE(_eventResetDirector); delete _renderer; diff --git a/native/cocos/base/CCEventAcceleration.h b/native/cocos/base/CCEventAcceleration.h index 7307328723..ae89577cb3 100644 --- a/native/cocos/base/CCEventAcceleration.h +++ b/native/cocos/base/CCEventAcceleration.h @@ -48,6 +48,7 @@ public: EventAcceleration(const Acceleration& acc); private: + virtual ~EventAcceleration() {} Acceleration _acc; friend class EventListenerAcceleration; }; diff --git a/native/cocos/base/CCEventCustom.h b/native/cocos/base/CCEventCustom.h index 0fec31786a..a842a2b6e5 100644 --- a/native/cocos/base/CCEventCustom.h +++ b/native/cocos/base/CCEventCustom.h @@ -66,6 +66,8 @@ public: */ inline const std::string& getEventName() const { return _eventName; }; protected: + virtual ~EventCustom() {} + void* _userData; ///< User data std::string _eventName; }; diff --git a/native/cocos/base/CCEventFocus.h b/native/cocos/base/CCEventFocus.h index f5d5956e80..6f37fd8573 100644 --- a/native/cocos/base/CCEventFocus.h +++ b/native/cocos/base/CCEventFocus.h @@ -54,6 +54,8 @@ public: EventFocus(ui::Widget* widgetLoseFocus, ui::Widget* widgetGetFocus); private: + virtual ~EventFocus() {} + ui::Widget *_widgetGetFocus; ui::Widget *_widgetLoseFocus; diff --git a/native/cocos/base/CCEventKeyboard.h b/native/cocos/base/CCEventKeyboard.h index 1b7236863d..d73dd18616 100644 --- a/native/cocos/base/CCEventKeyboard.h +++ b/native/cocos/base/CCEventKeyboard.h @@ -228,6 +228,8 @@ public: EventKeyboard(KeyCode keyCode, bool isPressed); private: + virtual ~EventKeyboard() {} + KeyCode _keyCode; bool _isPressed; diff --git a/native/cocos/base/CCEventMouse.h b/native/cocos/base/CCEventMouse.h index 692ecb855c..e28d5ef4ee 100644 --- a/native/cocos/base/CCEventMouse.h +++ b/native/cocos/base/CCEventMouse.h @@ -174,6 +174,8 @@ public: private: + virtual ~EventMouse() {} + MouseEventType _mouseEventType; int _mouseButton; float _x; diff --git a/native/cocos/base/CCEventTouch.h b/native/cocos/base/CCEventTouch.h index fc1074ea2d..eab1a8c426 100644 --- a/native/cocos/base/CCEventTouch.h +++ b/native/cocos/base/CCEventTouch.h @@ -88,6 +88,8 @@ public: #endif private: + virtual ~EventTouch() {} + EventCode _eventCode; std::vector _touches; diff --git a/native/cocos/platform/ios/CCDevice-ios.mm b/native/cocos/platform/ios/CCDevice-ios.mm index d83a0f3043..ac749e5f59 100644 --- a/native/cocos/platform/ios/CCDevice-ios.mm +++ b/native/cocos/platform/ios/CCDevice-ios.mm @@ -263,9 +263,10 @@ static CCAccelerometerDispatcher* s_pAccelerometerDispatcher; NSAssert(false, @"unknown orientation"); } - cocos2d::EventAcceleration event(*_acceleration); + cocos2d::EventAcceleration* event = new (std::nothrow) cocos2d::EventAcceleration(*_acceleration); auto dispatcher = cocos2d::Director::getInstance()->getEventDispatcher(); - dispatcher->dispatchEvent(&event); + dispatcher->dispatchEvent(event); + event->release(); } @end #endif // !defined(CC_TARGET_OS_TVOS)