change strncpy to _strncpy_safe

Change-Id: Ibfab9b418ebd65ef7e1ed1934eb2ce5b7faa5351

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 9c2c709..a344ad5 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -555,7 +555,7 @@ int media_svc_move_item(MediaSvcHandle *handle, const char *storage_id, media_sv
                /* If old thumb path is default or not */
                char *default_thumbnail_path = _media_svc_get_thumb_default_path(uid);
                if (STRING_VALID(default_thumbnail_path) && (strncmp(old_thumb_path, default_thumbnail_path, strlen(default_thumbnail_path)) == 0))
-                       strncpy(new_thumb_path, default_thumbnail_path, sizeof(new_thumb_path));
+                       _strncpy_safe(new_thumb_path, default_thumbnail_path, sizeof(new_thumb_path));
                else
                        _media_svc_get_thumbnail_path(dest_storage, new_thumb_path, dest_path, THUMB_EXT, uid);
 
@@ -1046,24 +1046,21 @@ int media_svc_rename_folder(MediaSvcHandle *handle, const char *storage_id, cons
                bool no_thumb = FALSE;
 
                if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 0))) {
-                       strncpy(media_uuid, (const char *)sqlite3_column_text(sql_stmt, 0), sizeof(media_uuid));
-                       media_uuid[sizeof(media_uuid) - 1] = '\0';
+                       _strncpy_safe(media_uuid, (const char *)sqlite3_column_text(sql_stmt, 0), sizeof(media_uuid));
                } else {
                        media_svc_error("media UUID is NULL");
                        return MS_MEDIA_ERR_DB_INTERNAL;
                }
 
                if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 1))) {
-                       strncpy(media_path, (const char *)sqlite3_column_text(sql_stmt, 1), sizeof(media_path));
-                       media_path[sizeof(media_path) - 1] = '\0';
+                       _strncpy_safe(media_path, (const char *)sqlite3_column_text(sql_stmt, 1), sizeof(media_path));
                } else {
                        media_svc_error("media path is NULL");
                        return MS_MEDIA_ERR_DB_INTERNAL;
                }
 
                if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 2))) {
-                       strncpy(media_thumb_path,       (const char *)sqlite3_column_text(sql_stmt, 2), sizeof(media_thumb_path));
-                       media_thumb_path[sizeof(media_thumb_path) - 1] = '\0';
+                       _strncpy_safe(media_thumb_path, (const char *)sqlite3_column_text(sql_stmt, 2), sizeof(media_thumb_path));
                } else {
                        media_svc_debug("media thumb path doesn't exist in DB");
                        no_thumb = TRUE;
@@ -1088,7 +1085,7 @@ int media_svc_rename_folder(MediaSvcHandle *handle, const char *storage_id, cons
                        /* If old thumb path is default or not */
                        char *default_thumbnail_path = _media_svc_get_thumb_default_path(uid);
                        if (STRING_VALID(default_thumbnail_path) && (strncmp(media_thumb_path, default_thumbnail_path, strlen(default_thumbnail_path)) == 0)) {
-                               strncpy(media_new_thumb_path, default_thumbnail_path, sizeof(media_new_thumb_path) - 1);
+                               _strncpy_safe(media_new_thumb_path, default_thumbnail_path, sizeof(media_new_thumb_path));
                        } else {
                                ret = _media_svc_get_storage_type_by_path(replaced_path, &storage_type, uid);
                                if (ret != MS_MEDIA_ERR_NONE) {