Fix memory leaks

Change-Id: I6351967e7c4c4ce69d60fc7259973ac452de4a0c

diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp
index a59d0cf..56f4162 100644 (file)
--- a/src/GlAlbumListEditorForm.cpp
+++ b/src/GlAlbumListEditorForm.cpp
@@ -371,6 +371,15 @@ AlbumListEditorForm::CreateItem(int index)
                }
        }
 
+       if (pBitmapRenameBg)
+       {
+               delete pBitmapRenameBg;
+       }
+       if (pBitmapRename)
+       {
+               delete pBitmapRename;
+       }
+
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return pIconListviewItem;
@@ -765,13 +774,13 @@ void AlbumListEditorForm::OnFileOpComplete(enum FileActionMode actionId, enum Fi
 bool AlbumListEditorForm::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo)
 {
        AppLogDebug("ENTER");
+
        if(keyEventInfo.GetKeyCode() == KEY_BACK)
        {
                __pDeletePopup->SetShowState(false);
                __pDeletePopup->Show();
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
-
        return false;
 }
 

diff --git a/src/GlAlbumListPresentationModel.cpp b/src/GlAlbumListPresentationModel.cpp
index 4f604a2..3f60859 100644 (file)
--- a/src/GlAlbumListPresentationModel.cpp
+++ b/src/GlAlbumListPresentationModel.cpp
@@ -110,6 +110,8 @@ AlbumListPresentationModel::~AlbumListPresentationModel(void)
 {
        AppLogDebug("ENTER");
        DeviceManager::RemoveDeviceEventListener(DEVICE_TYPE_STORAGE_CARD, *this);
+       delete __pFolderBackgroundBitmap;
+       delete __pContentManager;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 

diff --git a/src/GlContentUpdateEventListener.cpp b/src/GlContentUpdateEventListener.cpp
index 5efd30f..cea1f25 100644 (file)
--- a/src/GlContentUpdateEventListener.cpp
+++ b/src/GlContentUpdateEventListener.cpp
@@ -43,6 +43,7 @@ ContentUpdateEventListener::~ContentUpdateEventListener(void)
 {
        AppLogDebug("ENTER");
        __pContentManager->RemoveContentUpdateEventListener(*this);
+       delete __pContentManager;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 

diff --git a/src/GlFileListPresentationModel.cpp b/src/GlFileListPresentationModel.cpp
index e59bc2f..24a0732 100644 (file)
--- a/src/GlFileListPresentationModel.cpp
+++ b/src/GlFileListPresentationModel.cpp
@@ -98,6 +98,13 @@ FileListPresentationModel::~FileListPresentationModel(void)
 {
        AppLogDebug("ENTER");
        DeviceManager::RemoveDeviceEventListener(DEVICE_TYPE_STORAGE_CARD, *this);
+       if (__pContentIdList)
+       {
+               __pContentIdList->RemoveAll(true);
+               delete __pContentIdList;
+               __pContentIdList = null;
+       }
+       delete __pContentManager;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -451,6 +458,7 @@ FileListPresentationModel::GetThumbnailInSyncCacheN(const int index, String*& pN
        {
                delete pThumbnailInfo;
        }
+
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
@@ -687,7 +695,10 @@ FileListPresentationModel::OnContentUpdated(void)
                return;
        }
        //Clear the ImageCaches when content is updated like rotate.
-       ClearImageCache();
+       if ( __pContentEventListener->GetCount() )
+       {
+               ClearImageCache();
+       }
 
        IFormContentUpdateEventListener* pInterface = null;
        if (__pContentEventListener == null)

diff --git a/src/GlSettingPresentationModel.cpp b/src/GlSettingPresentationModel.cpp
index b8e62a9..e140215 100644 (file)
--- a/src/GlSettingPresentationModel.cpp
+++ b/src/GlSettingPresentationModel.cpp
@@ -57,6 +57,7 @@ SettingPresentationModel::SettingPresentationModel(void)
 SettingPresentationModel::~SettingPresentationModel(void)
 {
        AppLogDebug("ENTER");
+       delete __pDefaultGalleryRegistry;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 

diff --git a/src/GlThumbnailInfo.cpp b/src/GlThumbnailInfo.cpp
index d71fde9..559ca33 100755 (executable)
--- a/src/GlThumbnailInfo.cpp
+++ b/src/GlThumbnailInfo.cpp
@@ -36,6 +36,7 @@ ThumbnailInfo::ThumbnailInfo(void)
 
 ThumbnailInfo::~ThumbnailInfo(void)
 {
+       delete __pBitmap;
 }
 
 void
@@ -83,6 +84,10 @@ ThumbnailInfo::GetBitmapN(void) const
 void
 ThumbnailInfo::SetBitmap(const Bitmap& bitmap)
 {
+       if (__pBitmap)
+       {
+               delete __pBitmap;
+       }
        __pBitmap = CloneBitmapN(bitmap);
 }