fix memory leak (#20110)

cocos2d · Sep 17, 2019 · e73b7f1 · e73b7f1 · Yongrui · Oct 29, 2019
1 parent 4c48060
commit e73b7f1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/cocos/ui/UIVideoPlayer-ios.mm b/cocos/ui/UIVideoPlayer-ios.mm
@@ -87,7 +87,7 @@ @implementation UIVideoViewWrapperIos
 -(id)init:(void*)videoPlayer
 {
     if (self = [super init]) {
-        self.playerController = [AVPlayerViewController new];
+        self.playerController = [[AVPlayerViewController new] autorelease];
 
         [self setRepeatEnabled:FALSE];
         [self showPlaybackControls:TRUE];

diff --git a/cocos/ui/UIWebViewImpl-ios.mm b/cocos/ui/UIWebViewImpl-ios.mm
@@ -124,7 +124,7 @@ - (void)dealloc {
 
 - (void)setupWebView {
     if (!self.wkWebView) {
-        self.wkWebView = [[WKWebView alloc] init];
+        self.wkWebView = [[[WKWebView alloc] init] autorelease];
         self.wkWebView.UIDelegate = self;
         self.wkWebView.navigationDelegate = self;
     }

diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp
@@ -43,6 +43,10 @@ bool VideoPlayerTest::init()
 
     _visibleRect = Director::getInstance()->getOpenGLView()->getVisibleRect();
 
+    // Should create video first to make sure video is destryed first. If not, then may crash.
+    // Because when destroying video, it will stop video which may trigger stopped event listener.
+    createVideo();
+
     MenuItemFont::setFontSize(16);
 
     auto fullSwitch = MenuItemFont::create("FullScreenSwitch", CC_CALLBACK_1(VideoPlayerTest::menuFullScreenCallback, this));
@@ -95,8 +99,6 @@ bool VideoPlayerTest::init()
     _loopStatusLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
     _loopStatusLabel->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 185));
     _uiLayer->addChild(_loopStatusLabel);
-
-    createVideo();
 
     return true;
 }