fix memory leaking and avoid crash at RenderTexture

cocos2d/cocos2d-x#20531
zhongfq · Jun 28, 2020 · 92a9238 · 92a9238
1 parent 42dd179
commit 92a9238
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/frameworks/cocos2d-x/cocos/2d/CCRenderTexture.cpp b/frameworks/cocos2d-x/cocos/2d/CCRenderTexture.cpp
@@ -201,7 +201,10 @@ bool RenderTexture::initWithWidthAndHeight(int w, int h, backend::PixelFormat fo
             texture->release();
         }
         else
+        {
+            texture->release();
             break;
+        }
 
         _renderTargetFlags = RenderTargetFlag::COLOR;
 
@@ -474,11 +477,11 @@ void RenderTexture::newImage(std::function<void(Image*)> imageCallback, bool fli
     //        it should be cut
     int savedBufferWidth = (int)s.width;
     int savedBufferHeight = (int)s.height;
-
+    bool hasPremultipliedAlpha = _texture2D->hasPremultipliedAlpha();
     Image *image = new (std::nothrow) Image();
 
-    auto initCallback = [&, savedBufferWidth, savedBufferHeight, imageCallback](Image* image, const unsigned char* tempData){
-        image->initWithRawData(tempData, savedBufferWidth * savedBufferHeight * 4, savedBufferWidth, savedBufferHeight, 8, _texture2D->hasPremultipliedAlpha());
+    auto initCallback = [savedBufferWidth, savedBufferHeight, hasPremultipliedAlpha, imageCallback](Image* image, const unsigned char* tempData){
+        image->initWithRawData(tempData, savedBufferWidth * savedBufferHeight * 4, savedBufferWidth, savedBufferHeight, 8, hasPremultipliedAlpha);
         imageCallback(image);
     };
     auto callback = std::bind(initCallback, image, std::placeholders::_1);