//DBG("storage id: %d, path: %s", storage_id, path);
if (type == STORAGE_TYPE_EXTERNAL && path != NULL) {
- strncpy(storage_path, path, strlen(path));
+ strncpy(storage_path, path, strlen(path)+1);
+ storage_path[strlen(path)] = 0;
//DBG("external storage path : %s", storage_path);
}
if (error != STORAGE_ERROR_NONE) {
ERR("get external storage path Fail");
- if (external_path != NULL)
- strncpy(external_path, MTP_EXTERNAL_PATH_CHAR, strlen(MTP_EXTERNAL_PATH_CHAR) + 1);
+ if (external_path != NULL) {
+ strncpy(external_path, MTP_EXTERNAL_PATH_CHAR, sizeof(MTP_EXTERNAL_PATH_CHAR));
+ external_path[sizeof(MTP_EXTERNAL_PATH_CHAR) - 1] = 0;
+ }
}
}
uid_t _util_get_active_user()
if (active_name == NULL) {
ERR("active_name is NULL");
- strncpy(internal_path, MTP_USER_DIRECTORY, strlen(MTP_USER_DIRECTORY) + 1);
+ strncpy(internal_path, MTP_USER_DIRECTORY, sizeof(MTP_USER_DIRECTORY));
+ internal_path[sizeof(MTP_USER_DIRECTORY) - 1] = 0;
return;
}
if (internal_path != NULL) {
- strncpy(internal_path, MTP_INTERNAL_PATH_CHAR, strlen(MTP_INTERNAL_PATH_CHAR) + 1);
+ strncpy(internal_path, MTP_INTERNAL_PATH_CHAR, sizeof(MTP_INTERNAL_PATH_CHAR));
strncat(internal_path, active_name, strlen(active_name) + 1);
strncat(internal_path, "/media", 7);
+ internal_path[strlen(internal_path)] = 0;
}
ERR("internal path is %s", internal_path);