Merge pull request #6261 from iSevenDays/patch-9

Fix memory leak
cocos2d · Apr 18, 2014 · 3e0a0ec · 3e0a0ec
2 parents 428bac9 + df0f24f
commit 3e0a0ec
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/cocos/2d/platform/CCImage.cpp b/cocos/2d/platform/CCImage.cpp
@@ -942,7 +942,14 @@ bool Image::initWithPngData(const unsigned char * data, ssize_t dataLen)
 
         _dataLen = rowbytes * _height;
         _data = static_cast<unsigned char*>(malloc(_dataLen * sizeof(unsigned char)));
-        CC_BREAK_IF(!_data);
+        if(!_data)
+        {
+            if (row_pointers != nullptr)
+            {
+                free(row_pointers);
+            }
+            break;
+        }
 
         for (unsigned short i = 0; i < _height; ++i)
         {
@@ -957,7 +964,7 @@ bool Image::initWithPngData(const unsigned char * data, ssize_t dataLen)
         if (row_pointers != nullptr)
         {
             free(row_pointers);
-        };
+        }
 
         bRet = true;
     } while (0);
@@ -2028,6 +2035,9 @@ bool Image::saveImageToPNG(const std::string& filePath, bool isToRGB)
                 {
                     fclose(fp);
                     png_destroy_write_struct(&png_ptr, &info_ptr);
+
+                    free(row_pointers);
+                    row_pointers = nullptr;
                     break;
                 }