diff options
| author | Kyeonghun Lee <kh9090.lee@samsung.com> | 2016-07-11 10:06:28 +0900 |
|---|---|---|
| committer | Kyeonghun Lee <kh9090.lee@samsung.com> | 2016-07-11 10:39:27 +0900 |
| commit | 4dda78524e19516af7eebf2fc1f04862e1cf5960 (patch) | |
| tree | 9989aa5bcf21189fbec6c14cb745cfc82a4e94ed /manager | |
| parent | d53172148b55fe548d7ea0043a3934314532b7f0 (diff) | |
| download | msg-service-4dda78524e19516af7eebf2fc1f04862e1cf5960.tar.gz msg-service-4dda78524e19516af7eebf2fc1f04862e1cf5960.tar.bz2 msg-service-4dda78524e19516af7eebf2fc1f04862e1cf5960.zip | |
resolove TSAM-6227: use snprintf instead of strncpy to prevent from null string copy issuesubmit/tizen/20160711.021405accepted/tizen/wearable/20160711.030818accepted/tizen/mobile/20160711.030831accepted/tizen/ivi/20160711.031256accepted/tizen/common/20160711.170331
Change-Id: Ifdb70c70580b8b16345c782947ffc5b5495f6a36
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
Diffstat (limited to 'manager')
| -rw-r--r-- | manager/src/msg-manager-sound.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/manager/src/msg-manager-sound.cpp b/manager/src/msg-manager-sound.cpp index e5b9db4..df7e527 100644 --- a/manager/src/msg-manager-sound.cpp +++ b/manager/src/msg-manager-sound.cpp @@ -77,7 +77,7 @@ int MsgMgrGetFileSize(const char *pFileName) struct stat file_stat; if (lstat(pFileName, &file_stat)) { - MSG_MGR_FATAL("error lstat: %s", g_strerror(errno)); + MSG_MGR_FATAL("file[%s] error lstat: %s", pFileName, g_strerror(errno)); return -1; } @@ -175,7 +175,13 @@ void MsgMgrGetRingtonePath(char *userRingtonePath, char **msg_tone_file_path_p) msg_tone_file_path = NULL; } else { MSG_MGR_DEBUG("Set ringtone to defaultRingtonePath."); - strncpy(msg_tone_file_path, defaultRingtonePath, MSG_FILEPATH_LEN_MAX); + if (defaultRingtonePath && defaultRingtonePath[0] != '\0') { + MSG_MGR_DEBUG("defaultRingtonePath [%s]", defaultRingtonePath); + snprintf(msg_tone_file_path, MSG_FILEPATH_LEN_MAX, "%s", defaultRingtonePath); + } else { + MSG_MGR_DEBUG("defaultRingtonePath is null"); + msg_tone_file_path = NULL; + } } } else { MSG_MGR_DEBUG("Set ringtone to tmpFilePath."); @@ -357,7 +363,7 @@ void MsgMgrSoundPlayStart(const MSG_MGR_ADDRESS_INFO_S *pAddrInfo, MSG_MGR_SOUND } else if (soundType == MSG_MGR_SOUND_PLAY_DEFAULT) { msg_tone_file_path = new char[MSG_FILEPATH_LEN_MAX+1]; memset(msg_tone_file_path, 0x00, sizeof(char)*(MSG_FILEPATH_LEN_MAX+1)); - strncpy(msg_tone_file_path, DEFAULT_ALERT_FILE, MSG_FILEPATH_LEN_MAX); + snprintf(msg_tone_file_path, MSG_FILEPATH_LEN_MAX, "%s", DEFAULT_ALERT_FILE); } else { MsgMgrGetRingtonePath(contactInfo.alerttonePath, &msg_tone_file_path); } |