diff --git a/src/add-ons/media/plugins/ape_reader/APEReader.cpp b/src/add-ons/media/plugins/ape_reader/APEReader.cpp index 09c1a21609..5d3e214e40 100644 --- a/src/add-ons/media/plugins/ape_reader/APEReader.cpp +++ b/src/add-ons/media/plugins/ape_reader/APEReader.cpp @@ -68,10 +68,10 @@ TAPEReader::GetFileFormatInfo(media_file_format* oMFF) | media_file_format::B_KNOWS_ENCODED_AUDIO; oMFF->family = B_ANY_FORMAT_FAMILY; oMFF->version = MEDIA_FILE_FORMAT_VERSION; - strcpy(oMFF->mime_type, MIME_TYPE_APE); - strcpy(oMFF->pretty_name, MIME_TYPE_APE_LONG_DESCRIPTION); - strcpy(oMFF->short_name, MIME_TYPE_APE_SHORT_DESCRIPTION); - strcpy(oMFF->file_extension, MIME_TYPE_APE_EXTENSION); + strlcpy(oMFF->mime_type, MIME_TYPE_APE, sizeof(oMFF->mime_type)); + strlcpy(oMFF->pretty_name, MIME_TYPE_APE_LONG_DESCRIPTION, sizeof(oMFF->pretty_name)); + strlcpy(oMFF->short_name, MIME_TYPE_APE_SHORT_DESCRIPTION, sizeof(oMFF->short_name)); + strlcpy(oMFF->file_extension, MIME_TYPE_APE_EXTENSION, sizeof(oMFF->file_extension)); } diff --git a/src/add-ons/media/plugins/au_reader/au_reader.cpp b/src/add-ons/media/plugins/au_reader/au_reader.cpp index 6f45c99bfc..8011977eb9 100644 --- a/src/add-ons/media/plugins/au_reader/au_reader.cpp +++ b/src/add-ons/media/plugins/au_reader/au_reader.cpp @@ -271,10 +271,10 @@ auReader::GetFileFormatInfo(media_file_format *mff) | media_file_format::B_IMPERFECTLY_SEEKABLE; mff->family = B_MISC_FORMAT_FAMILY; mff->version = 100; - strcpy(mff->mime_type, "audio/x-au"); - strcpy(mff->file_extension, "au"); - strcpy(mff->short_name, "Sun audio file"); - strcpy(mff->pretty_name, "Sun audio file"); + strlcpy(mff->mime_type, "audio/x-au", sizeof(mff->mime_type)); + strlcpy(mff->file_extension, "au", sizeof(mff->file_extension)); + strlcpy(mff->short_name, "Sun audio file", sizeof(mff->short_name)); + strlcpy(mff->pretty_name, "Sun audio file", sizeof(mff->pretty_name)); } diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp index 6f92bf9a96..02ff8de400 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp @@ -1541,34 +1541,35 @@ AVFormatReader::GetFileFormatInfo(media_file_format* mff) mff->version = 100; if (format != NULL) { - strcpy(mff->mime_type, format->mime_type); + strlcpy(mff->mime_type, format->mime_type, sizeof(mff->mime_type)); } else { // TODO: Would be nice to be able to provide this from AVInputFormat, // maybe by extending the FFmpeg code itself (all demuxers). - strcpy(mff->mime_type, ""); + mff->mime_type[0] = '\0'; } if (context->iformat->extensions != NULL) - strcpy(mff->file_extension, context->iformat->extensions); + strlcpy(mff->file_extension, context->iformat->extensions, sizeof(mff->file_extension)); else { TRACE(" no file extensions for AVInputFormat.\n"); - strcpy(mff->file_extension, ""); + mff->file_extension[0] = '\0'; } if (context->iformat->name != NULL) - strcpy(mff->short_name, context->iformat->name); + strlcpy(mff->short_name, context->iformat->name, sizeof(mff->short_name)); else { TRACE(" no short name for AVInputFormat.\n"); - strcpy(mff->short_name, ""); + mff->short_name[0] = '\0'; } - if (context->iformat->long_name != NULL) - sprintf(mff->pretty_name, "%s (FFmpeg)", context->iformat->long_name); - else { + if (context->iformat->long_name != NULL) { + snprintf(mff->pretty_name, sizeof(mff->pretty_name), "%s (FFmpeg)", + context->iformat->long_name); + } else { if (format != NULL) sprintf(mff->pretty_name, "%s (FFmpeg)", format->pretty_name); else - strcpy(mff->pretty_name, "Unknown (FFmpeg)"); + strlcpy(mff->pretty_name, "Unknown (FFmpeg)", sizeof(mff->pretty_name)); } } diff --git a/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp b/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp index 01e32278bd..182f93ddd9 100644 --- a/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp +++ b/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp @@ -50,12 +50,12 @@ AudioBufferSize(int32 channel_count, uint32 sample_format, float frame_rate, big void RawDecoder::GetCodecInfo(media_codec_info *info) { - strcpy(info->short_name, "raw"); + strlcpy(info->short_name, "raw", sizeof(info->short_name)); if (fInputFormat.IsAudio()) - strcpy(info->pretty_name, "Raw audio decoder"); + strlcpy(info->pretty_name, "Raw audio decoder", sizeof(info->pretty_name)); else - strcpy(info->pretty_name, "Raw video decoder"); + strlcpy(info->pretty_name, "Raw video decoder", sizeof(info->pretty_name)); }