From 42a01c0241f0079022cc321121421555c9b4d8cc Mon Sep 17 00:00:00 2001 From: Sangkoo Kim Date: Mon, 7 Mar 2016 14:51:19 +0900 Subject: [PATCH] Fix svace defect Change-Id: Iae1cdc158e1a182aabc26e39007a1c18a02054e2 --- externals/MsgNotificationWrapper.cpp | 3 ++ externals/MsgSoundPlayer.cpp | 1 + .../storage-handler/MsgStorageMessage.cpp | 4 +-- .../transaction-manager/MsgTransManager.cpp | 2 +- mapi/msg_storage.cpp | 2 +- plugin/sms_plugin/SmsPluginSimMsg.cpp | 4 +-- plugin/sms_plugin/SmsPluginStorage.cpp | 2 +- utils/MsgVMessage.cpp | 33 ++++++++++--------- vobject-engine/VCard.c | 11 +++---- vobject-engine/VMessage.c | 10 +++--- vobject-engine/include/VCard.h | 6 ++-- vobject-engine/include/VMessage.h | 6 ++-- vobject-engine/include/VTypes.h | 4 --- 13 files changed, 42 insertions(+), 46 deletions(-) diff --git a/externals/MsgNotificationWrapper.cpp b/externals/MsgNotificationWrapper.cpp index 35188bc..fed5d71 100755 --- a/externals/MsgNotificationWrapper.cpp +++ b/externals/MsgNotificationWrapper.cpp @@ -1944,8 +1944,10 @@ void setActiveIcon(notification_h noti_h, MSG_NOTI_INFO_S *noti_info) case MSG_WAP_SI_SMS: case MSG_WAP_SL_SMS: setNotiImage(noti_h, NOTIFICATION_IMAGE_TYPE_ICON, MSG_ACTIVE_PUSH_ICON_PATH); + break; case MSG_SYNCML_CP: setNotiImage(noti_h, NOTIFICATION_IMAGE_TYPE_ICON, MSG_OTA_ICON_PATH); + break; default: if (noti_info->imagePath[0] != '\0') setNotiImage(noti_h, NOTIFICATION_IMAGE_TYPE_ICON, noti_info->imagePath); @@ -1953,6 +1955,7 @@ void setActiveIcon(notification_h noti_h, MSG_NOTI_INFO_S *noti_info) setNotiImage(noti_h, NOTIFICATION_IMAGE_TYPE_ICON, MSG_NO_CONTACT_PROFILE_ICON_PATH); setNotiImage(noti_h, NOTIFICATION_IMAGE_TYPE_ICON_SUB, MSG_MESSAGE_APP_SUB_ICON); + break; } break; diff --git a/externals/MsgSoundPlayer.cpp b/externals/MsgSoundPlayer.cpp index 4e89169..292642f 100755 --- a/externals/MsgSoundPlayer.cpp +++ b/externals/MsgSoundPlayer.cpp @@ -577,6 +577,7 @@ void MsgSoundPlayer::MsgSoundPlayMelody(char *pMsgToneFilePath) if (g_stream_info == NULL) { MSG_DEBUG("g_stream_info is NULL"); + pthread_mutex_unlock(&muMmPlay); return; } diff --git a/framework/storage-handler/MsgStorageMessage.cpp b/framework/storage-handler/MsgStorageMessage.cpp index 9324ab6..385cbb9 100755 --- a/framework/storage-handler/MsgStorageMessage.cpp +++ b/framework/storage-handler/MsgStorageMessage.cpp @@ -1103,7 +1103,7 @@ msg_error_t MsgStoDeleteAllMessageInFolder(msg_folder_id_t folderId, bool bOnlyD /*** **/ /*** Delete Sim Message In Folder **/ - if (folderId >= MSG_INBOX_ID) { + if ((unsigned char)folderId >= (unsigned char)MSG_INBOX_ID) { memset(sqlQuery, 0x00, sizeof(sqlQuery)); snprintf(sqlQuery, sizeof(sqlQuery), "SELECT MSG_ID FROM %s WHERE FOLDER_ID = %d AND STORAGE_ID = %d", @@ -1674,7 +1674,7 @@ msg_error_t MsgStoMoveMessageToFolder(msg_message_id_t msgId, msg_folder_id_t de err = MsgStoUpdateConversation(dbHandle, convId); /* update notification */ - if (destFolderId != MSG_SPAMBOX_ID) + if ((unsigned char)destFolderId != (unsigned char)MSG_SPAMBOX_ID) MsgRefreshAllNotification(true, false, MSG_ACTIVE_NOTI_TYPE_NONE); return err; diff --git a/framework/transaction-manager/MsgTransManager.cpp b/framework/transaction-manager/MsgTransManager.cpp index f646510..725d673 100755 --- a/framework/transaction-manager/MsgTransManager.cpp +++ b/framework/transaction-manager/MsgTransManager.cpp @@ -303,6 +303,7 @@ void MsgTransactionManager::workerEventQueue() MSG_CMD_S* pCmd = NULL; int (*pfHandler)(const MSG_CMD_S*, char**) = NULL; char* pEventData = NULL; + unique_ptr eventBuf(&pEventData, unique_ptr_deleter); int fd = -1; int eventSize = 0; @@ -344,7 +345,6 @@ void MsgTransactionManager::workerEventQueue() MSG_DEBUG("Replying to fd [%d], size [%d]", fd, eventSize); servSock.write(fd, pEventData, eventSize); g_free(pCmd); pCmd = NULL; - g_free(pEventData); pEventData = NULL; } } diff --git a/mapi/msg_storage.cpp b/mapi/msg_storage.cpp index b875a8f..eed39bf 100755 --- a/mapi/msg_storage.cpp +++ b/mapi/msg_storage.cpp @@ -617,7 +617,7 @@ EXPORT_API int msg_generate_message(msg_handle_t handle, msg_message_type_t msg_ return MSG_ERR_INVALID_PARAMETER; } - if (folder_id >= MSG_MAX_FOLDER_ID) { + if ((unsigned char)folder_id >= (unsigned char)MSG_MAX_FOLDER_ID) { MSG_DEBUG("folderId is invalid [%d]", folder_id); return MSG_ERR_INVALID_PARAMETER; } diff --git a/plugin/sms_plugin/SmsPluginSimMsg.cpp b/plugin/sms_plugin/SmsPluginSimMsg.cpp index 864a836..b57fd8c 100755 --- a/plugin/sms_plugin/SmsPluginSimMsg.cpp +++ b/plugin/sms_plugin/SmsPluginSimMsg.cpp @@ -401,7 +401,7 @@ msg_error_t SmsPluginSimMsg::saveClass2Message(const MSG_MESSAGE_INFO_S *pMsgInf TelSmsData_t simSmsData = {0, }; if (submitData.segCount == 1) { - memcpy(&simSmsData.SmsData.Sca, &simMsgDataInfo.sca, sizeof(simSmsData.SmsData.Sca)); + memcpy(&simSmsData.SmsData.Sca, &simMsgDataInfo.sca, sizeof(simSmsData.SmsData.Sca)-1); memcpy(&simSmsData.SmsData.szData, &simMsgDataInfo.szData, sizeof(simSmsData.SmsData.szData)-1); simSmsData.SmsData.MsgLength = simMsgDataInfo.msgLength; @@ -415,7 +415,7 @@ msg_error_t SmsPluginSimMsg::saveClass2Message(const MSG_MESSAGE_INFO_S *pMsgInf /* Set TPDU data */ int copyLen = (bufLen > TAPI_NETTEXT_SMDATA_SIZE_MAX) ? TAPI_NETTEXT_SMDATA_SIZE_MAX : bufLen; - memcpy((void*)simSmsData.SmsData.Sca, &simMsgDataInfo.sca, sizeof(simSmsData.SmsData.Sca)); + memcpy((void*)simSmsData.SmsData.Sca, &simMsgDataInfo.sca, sizeof(simSmsData.SmsData.Sca)-1); memcpy((void*)simSmsData.SmsData.szData, buf, (size_t)copyLen); simSmsData.SmsData.szData[copyLen] = 0; simSmsData.SmsData.MsgLength = copyLen; diff --git a/plugin/sms_plugin/SmsPluginStorage.cpp b/plugin/sms_plugin/SmsPluginStorage.cpp index 0093140..dbeba09 100755 --- a/plugin/sms_plugin/SmsPluginStorage.cpp +++ b/plugin/sms_plugin/SmsPluginStorage.cpp @@ -638,7 +638,7 @@ msg_error_t SmsPluginStorage::deleteSmsMessage(msg_message_id_t msgId) dbHandle->endTrans(true); - if (folderId == MSG_INBOX_ID) { + if ((unsigned char)folderId == (unsigned char)MSG_INBOX_ID) { msgType.classType = MSG_CLASS_NONE; /** Set memory status in SIM */ diff --git a/utils/MsgVMessage.cpp b/utils/MsgVMessage.cpp index b5d210d..47cab77 100755 --- a/utils/MsgVMessage.cpp +++ b/utils/MsgVMessage.cpp @@ -554,9 +554,9 @@ char* __msgsvc_vmsg_convert_tm_to_vdata_str(struct tm * tm) mon = tm->tm_mon + 1; if (tm->tm_hour >= 12) - strcpy(APM, "PM"); + strncpy(APM, "PM", 2); else - strcpy(APM, "AM"); + strncpy(APM, "AM", 2); if (tm->tm_hour > 12) hour = tm->tm_hour - 12; @@ -565,40 +565,40 @@ char* __msgsvc_vmsg_convert_tm_to_vdata_str(struct tm * tm) switch(mon) { case 1: - strcpy(month, "Jan"); + strncpy(month, "Jan", 3); break; case 2: - strcpy(month, "Feb"); + strncpy(month, "Feb", 3); break; case 3: - strcpy(month, "Mar"); + strncpy(month, "Mar", 3); break; case 4: - strcpy(month, "Apr"); + strncpy(month, "Apr", 3); break; case 5: - strcpy(month, "May"); + strncpy(month, "May", 3); break; case 6: - strcpy(month, "Jun"); + strncpy(month, "Jun", 3); break; case 7: - strcpy(month, "Jul"); + strncpy(month, "Jul", 3); break; case 8: - strcpy(month, "Aug"); + strncpy(month, "Aug", 3); break; case 9: - strcpy(month, "Sep"); + strncpy(month, "Sep", 3); break; case 10: - strcpy(month, "Oct"); + strncpy(month, "Oct", 3); break; case 11: - strcpy(month, "Nov"); + strncpy(month, "Nov", 3); break; case 12: - strcpy(month, "Dec"); + strncpy(month, "Dec", 3); break; default: MSG_DEBUG("invalid month number"); @@ -764,7 +764,7 @@ static inline int __msgsvc_vmsg_append_origin_address_vcard(MSG_MESSAGE_INFO_S * char originAddress[MAX_ADDRESS_VAL_LEN + 1] = {0, }; bool isDisplayName = false; - if (pMsg->folderId == MSG_INBOX_ID) { + if ((unsigned char)(pMsg->folderId) == (unsigned char)MSG_INBOX_ID) { strcpy(originAddress, pMsg->addressList[0].addressVal); } @@ -1955,7 +1955,7 @@ static inline msg_error_t __msgsvc_vmsg_get_msg(int ver, char *vmsg, MSG_MESSAGE } tempMsgText[i] = '\0'; char * temp = __msgsvc_vmsg_remove_escape_char(tempMsgText); - strcpy(pMsg->msgText, temp); + snprintf(pMsg->msgText, sizeof(pMsg->msgText), "%s", temp); MSG_DEBUG("pMsg->msgText : %s", pMsg->msgText); pMsg->dataSize = strlen(pMsg->msgText); pMsg->bTextSms = true; @@ -2031,6 +2031,7 @@ static inline msg_error_t __msgsvc_vmsg_get_msg(int ver, char *vmsg, MSG_MESSAGE break; case VMSG_MSG_BEGIN: end = __msgsvc_vmsg_get_msg_begin(pMsg, val, &vCardCnt); + break; case VMSG_MSG_END: end = __msgsvc_vmsg_get_msg_end(pMsg, val); if (end) { diff --git a/vobject-engine/VCard.c b/vobject-engine/VCard.c index 3e1b026..b622b37 100755 --- a/vobject-engine/VCard.c +++ b/vobject-engine/VCard.c @@ -814,8 +814,7 @@ VCardGetCharsetValue(int index) * @param pVCardRaw The raw data * @return vObject The result value */ -SLPAPI VTree* -vcard_decode(char *pCardRaw) +VTree* vcard_decode(char *pCardRaw) { VDATA_TRACE_BEGINE; char* szValue = NULL; @@ -1057,7 +1056,7 @@ CATCH: VFREE(pTemp); CATCH1: VFREE(pCardRawTmp); - __VCardFreeVTreeMemory(pVCard); + vcard_free_vtree_memory(pVCard); VDATA_TRACE_END return NULL; } @@ -1068,8 +1067,7 @@ CATCH1: * @param pVCardRaw Data which will be encoded * @return char * Encoded result */ -SLPAPI char* -vcard_encode(VTree *pVCardRaw) +char* vcard_encode(VTree *pVCardRaw) { VDATA_TRACE_BEGINE char* pVCardRes = NULL; @@ -1473,8 +1471,7 @@ __VCardParamEncode(VObject* pTypeObj, int* pEnc) return szParam; } -SLPAPI bool -vcard_free_vtree_memory(VTree * pTree) +bool vcard_free_vtree_memory(VTree * pTree) { VDATA_TRACE_BEGINE if (pTree == NULL) { diff --git a/vobject-engine/VMessage.c b/vobject-engine/VMessage.c index a23f61f..60ea296 100755 --- a/vobject-engine/VMessage.c +++ b/vobject-engine/VMessage.c @@ -765,8 +765,7 @@ VMsgGetCharsetValue(int index) * @param pVMsgRaw The raw data * @return vObject The result value */ -SLPAPI VTree* -vmsg_decode(char *pMsgRaw) +VTree* vmsg_decode(char *pMsgRaw) { VDATA_TRACE_BEGINE; @@ -1045,7 +1044,7 @@ CATCH: CATCH1: VFREE(szMsgBegin); VFREE(pMsgRawTmp); - __VMsgFreeVTreeMemory(pVMsg); + vmsg_free_vtree_memory(pVMsg); VDATA_TRACE_END return NULL; } @@ -1056,8 +1055,7 @@ CATCH1: * @param pVMsgRaw Data which will be encoded * @return char * Encoded result */ -SLPAPI char* -vmsg_encode(VTree *pVMsgRaw) +char* vmsg_encode(VTree *pVMsgRaw) { VDATA_TRACE_BEGINE char* pVMsgRes = NULL; @@ -1523,7 +1521,7 @@ __VMsgParamEncode(VObject* pTypeObj, int* pEnc) return szParam; } -SLPAPI bool +bool vmsg_free_vtree_memory(VTree * pTree) { VDATA_TRACE_BEGINE diff --git a/vobject-engine/include/VCard.h b/vobject-engine/include/VCard.h index 4079e2c..88e9899 100755 --- a/vobject-engine/include/VCard.h +++ b/vobject-engine/include/VCard.h @@ -199,7 +199,7 @@ typedef enum * @param[in] pVCardRaw Points to the vcard string. * @see vcard_encode */ -SLPAPI VTree* vcard_decode(char* pVCardRaw); +VTree* vcard_decode(char* pVCardRaw); /** * @fn char* vcard_encode(VTree* pVTree); @@ -209,7 +209,7 @@ SLPAPI VTree* vcard_decode(char* pVCardRaw); * @param[in] pVTree Points to a VTree. * @see vcard_decode */ -SLPAPI char* vcard_encode(VTree* pVTree); +char* vcard_encode(VTree* pVTree); /** * @fn char* vcard_free_vtree_memory(VTree* pTree); @@ -218,7 +218,7 @@ SLPAPI char* vcard_encode(VTree* pVTree); * @return This function returns value of success or fail * @param[in] pVTree Points to a VTree. */ -SLPAPI bool vcard_free_vtree_memory(VTree * pTree); +bool vcard_free_vtree_memory(VTree * pTree); #ifdef __cplusplus } diff --git a/vobject-engine/include/VMessage.h b/vobject-engine/include/VMessage.h index ddf2f6a..8a14bd4 100755 --- a/vobject-engine/include/VMessage.h +++ b/vobject-engine/include/VMessage.h @@ -177,7 +177,7 @@ typedef enum * @param[in] pVCardRaw Points to the vcard string. * @see vcard_encode */ -SLPAPI VTree* vmsg_decode(char* pVMsgRaw); +VTree* vmsg_decode(char* pVMsgRaw); /** * @fn char* vcard_encode(VTree* pVTree); @@ -187,7 +187,7 @@ SLPAPI VTree* vmsg_decode(char* pVMsgRaw); * @param[in] pVTree Points to a VTree. * @see vcard_decode */ -SLPAPI char* vmsg_encode(VTree* pVTree); +char* vmsg_encode(VTree* pVTree); /** * @fn char* vcard_free_vtree_memory(VTree* pTree); @@ -196,7 +196,7 @@ SLPAPI char* vmsg_encode(VTree* pVTree); * @return This function returns value of success or fail * @param[in] pVTree Points to a VTree. */ -SLPAPI bool vmsg_free_vtree_memory(VTree * pTree); +bool vmsg_free_vtree_memory(VTree * pTree); #ifdef __cplusplus } diff --git a/vobject-engine/include/VTypes.h b/vobject-engine/include/VTypes.h index 15f7873..aab1f18 100755 --- a/vobject-engine/include/VTypes.h +++ b/vobject-engine/include/VTypes.h @@ -23,10 +23,6 @@ #include "string.h" #include "ctype.h" -#ifndef SLPAPI -#define SLPAPI __attribute__ ((visibility("default"))) -#endif - #define CR 0x0d #define LF 0x0a #define TAB 0x09 -- 2.34.1