From 3c37b36e6522c777e482292c7818d71612426519 Mon Sep 17 00:00:00 2001
From: Dmitry Isaikin <isaikin-dmitry@yandex.ru>
Date: Tue, 19 Jul 2016 06:34:38 +0300
Subject: Fix some memory leaks in MCIMAPSession.cpp in case of server error
 (#1480)

---
 src/core/imap/MCIMAPSession.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/core/imap/MCIMAPSession.cpp b/src/core/imap/MCIMAPSession.cpp
index 8491176f..67ff7341 100644
--- a/src/core/imap/MCIMAPSession.cpp
+++ b/src/core/imap/MCIMAPSession.cpp
@@ -3444,7 +3444,6 @@ IndexSet * IMAPSession::search(String * folder, IMAPSearchExpression * expressio
 {
     struct mailimap_search_key * key;
     
-    key = searchKeyFromSearchExpression(expression);
     selectIfNeeded(folder, pError);
     if (* pError != ErrorNone)
         return NULL;
@@ -3457,6 +3456,7 @@ IndexSet * IMAPSession::search(String * folder, IMAPSearchExpression * expressio
     }
     
     int r;
+    key = searchKeyFromSearchExpression(expression);
     if (mIsGmail) {
         r = mailimap_uid_search_literalplus(mImap, charset, key, &result_list);
     }
@@ -4329,11 +4329,12 @@ String * IMAPSession::htmlRendering(IMAPMessage * message, String * folder, Erro
                                                            NULL);
     * pError = dataCallback->error();
     
+    MC_SAFE_RELEASE(dataCallback);
+
     if (* pError != ErrorNone) {
         return NULL;
     }
     
-    MC_SAFE_RELEASE(dataCallback);
     return htmlString;
 }
 
@@ -4350,12 +4351,13 @@ String * IMAPSession::htmlBodyRendering(IMAPMessage * message, String * folder,
 
     * pError = dataCallback->error();
     
+    MC_SAFE_RELEASE(dataCallback);
+    MC_SAFE_RELEASE(htmlCallback);
+
     if (* pError != ErrorNone) {
         return NULL;
     }
     
-    MC_SAFE_RELEASE(dataCallback);
-    MC_SAFE_RELEASE(htmlCallback);
     return htmlBodyString;
 }
 
@@ -4412,10 +4414,10 @@ bool IMAPSession::enableFeature(String * feature)
     
     struct mailimap_capability_data * result;
     r = mailimap_enable(mImap, caps, &result);
+    mailimap_capability_data_free(caps);
     if (r != MAILIMAP_NO_ERROR)
         return false;
     
-    mailimap_capability_data_free(caps);
     mailimap_capability_data_free(result);
     
     return true;
-- 
cgit v1.2.3