Revert "[P151125-03506] NAVER server's server search is not operated"

[platform/core/messaging/email-service.git] / email-core / email-storage / email-storage.c

diff --git a/email-core/email-storage/email-storage.c b/email-core/email-storage/email-storage.c
index 654d92f..5e3ca31 100755 (executable)
--- a/email-core/email-storage/email-storage.c
+++ b/email-core/email-storage/email-storage.c
@@ -13437,7 +13437,7 @@ INTERNAL_FUNC int emstorage_get_pbd_mailbox_list(char *multi_user_name, int acco
 {
        EM_DEBUG_FUNC_BEGIN("account_id[%d], mailbox_list[%p], count[%p] err_code[%p]", account_id, mailbox_list, count, err_code);
 
-       if (account_id < FIRST_ACCOUNT_ID || NULL == mailbox_list || NULL == count) {
+       if (account_id < FIRST_ACCOUNT_ID || NULL == mailbox_list || *mailbox_list == NULL || NULL == count) {
                EM_DEBUG_EXCEPTION("account_id[%d], mailbox_list[%p], count[%p] err_code[%p]", account_id, mailbox_list, count, err_code);
                if (err_code != NULL)
                        *err_code = EMAIL_ERROR_INVALID_PARAM;
@@ -17840,8 +17840,6 @@ gint glist_compare_column_name(gconstpointer old_column_info, gconstpointer new_
        if (old_column_info == NULL || new_column_info == NULL)
                return -1;
 
-
-       EM_DEBUG_FUNC_END("error [%d]", error);
        return EM_SAFE_STRCMP((char*)left_one->column_name, (char*)right_one->column_name);
 }