merge with master

diff --git a/mapi/msg_message.cpp b/mapi/msg_message.cpp
index 579dc8b..b01381e 100755 (executable)
--- a/mapi/msg_message.cpp
+++ b/mapi/msg_message.cpp
@@ -51,7 +51,6 @@ void msg_message_create_struct(msg_struct_s *msg_struct)
        msg->pData = NULL;
        msg->pMmsData = NULL;
        msg->mmsDataSize = 0;
-       
        /* Allocate memory for address list of message */
        msg_struct_list_s *addr_list = (msg_struct_list_s *)new msg_struct_list_s;
 

diff --git a/mapi/msg_mms.cpp b/mapi/msg_mms.cpp
index a6bbe1b..fe6352d 100755 (executable)
--- a/mapi/msg_mms.cpp
+++ b/mapi/msg_mms.cpp
@@ -357,7 +357,6 @@ int msg_mms_get_int_value(msg_struct_s *msg_struct, int field, int *value)
        case MSG_STRUCT_MMS_MEDIA:
        {
                MMS_MEDIA_HIDDEN_S *mms_media_data = (MMS_MEDIA_HIDDEN_S *)msg_struct->data;
-               
                if (field == MSG_MMS_MEDIA_TYPE_INT)
                        *value = mms_media_data->mediatype;
                else if (field == MSG_MMS_MEDIA_DRM_TYPE_INT)

diff --git a/plugin/sms_plugin/SmsPluginTransport.cpp b/plugin/sms_plugin/SmsPluginTransport.cpp
index 0fab980..c31f16c 100755 (executable)
--- a/plugin/sms_plugin/SmsPluginTransport.cpp
+++ b/plugin/sms_plugin/SmsPluginTransport.cpp
@@ -783,7 +783,7 @@ MSG_DEBUG("reply address : [%s]", pMsgInfo->replyAddress);
 MSG_DEBUG("segment size : [%d], pData->segCount : [%d]", segSize, pData->segCount);
 
        if (pData->segCount > MAX_SEGMENT_NUM)
-               THROW(MsgException::SMS_PLG_ERROR, "Segment Count is over maximum : %d", pData->segCount);
+               THROW(MsgException::SMS_PLG_ERROR, "Segment Count is over maximum : %d", pData->segCount);
 
        int headerCnt = 0;
 
@@ -893,14 +893,14 @@ int SmsPluginTransport::getSegmentSize(SMS_CODING_SCHEME_T CodingScheme, int Dat
 
        if (CodingScheme == SMS_CHARSET_7BIT)
        {
-               if ((DataLen+headerSize) > maxSize)
+               if (((DataLen+headerSize)/maxSize) >= 1)
                        segSize = ((140*8) - ((headerLen + concat + headerSize)*8)) / 7;
                else
                        segSize = DataLen;
        }
        else if (CodingScheme == SMS_CHARSET_8BIT || CodingScheme == SMS_CHARSET_UCS2)
        {
-               if ((DataLen+headerSize) > maxSize)
+               if (((DataLen+headerSize)/maxSize) >= 1)
                        segSize = 140 - (headerLen + concat + headerSize);
                else
                        segSize = DataLen;

diff --git a/proxy/MsgHandleControl.cpp b/proxy/MsgHandleControl.cpp
index e59f292..34d4808 100755 (executable)
--- a/proxy/MsgHandleControl.cpp
+++ b/proxy/MsgHandleControl.cpp
@@ -342,6 +342,7 @@ void MsgHandle::convertMsgStruct(const MSG_MESSAGE_INFO_S *pSrc, MSG_MESSAGE_HID
 
                // Get Message Data from File
                if (pSrc->networkStatus != MSG_NETWORK_RETRIEVE_FAIL) {
+
                        if (MsgOpenAndReadFile(pSrc->msgData, &pFileData, &fileSize) == false)
                                THROW(MsgException::FILE_ERROR, "MsgOpenAndReadFile error");