From ea049e2bd6c62f5d0ffded2f2147931250535d77 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Fri, 18 May 2018 10:38:32 +0900 Subject: prevent dereferencing of NULL Change-Id: I4f9e34fafd95b4175399aa4198ebf91ac2e97a72 --- email-core/email-core-mailbox-sync.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/email-core/email-core-mailbox-sync.c b/email-core/email-core-mailbox-sync.c index 2aa22d6..9aa69f6 100755 --- a/email-core/email-core-mailbox-sync.c +++ b/email-core/email-core-mailbox-sync.c @@ -3531,8 +3531,10 @@ INTERNAL_FUNC int emcore_sync_mail_from_client_to_server(char *multi_user_name, if (read_size != data_size) { /* read fail. */ - EM_SAFE_FREE(data); EM_DEBUG_EXCEPTION("Read from file failed"); + INIT(&str_data, mail_string, NULL, read_size); + } else { + INIT(&str_data, mail_string, data, read_size); } sent_size += read_size; @@ -3571,12 +3573,13 @@ INTERNAL_FUNC int emcore_sync_mail_from_client_to_server(char *multi_user_name, if (read_size != data_size) { /* read fail. */ - EM_SAFE_FREE(data); EM_DEBUG_EXCEPTION("Read from file failed"); + INIT(&str_data, mail_string, NULL, read_size); + } else { + INIT(&str_data, mail_string, data, read_size); } sent_size += read_size; - INIT(&str_data, mail_string, data, read_size); if (!mail_append_message(stream, long_enc_path, &str_data)) { EM_DEBUG_EXCEPTION("mail_append failed -"); err = EMAIL_ERROR_IMAP4_APPEND_FAILURE; -- cgit v1.2.3