From aec33db178d1475aedf4ee37f385d4c85ed721a3 Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Sun, 27 Nov 2011 11:10:39 -0500 Subject: [PATCH] Replace inappropriate usage of strncpy by strlcpy --- src/add-ons/translators/exr/EXRTranslator.cpp | 2 +- src/add-ons/translators/gif/GIFTranslator.cpp | 4 ++-- src/add-ons/translators/png/PNGTranslator.cpp | 2 +- src/add-ons/translators/ppm/PPMTranslator.cpp | 4 ++-- src/add-ons/translators/rtf/RTFTranslator.cpp | 2 +- src/add-ons/translators/sgi/SGITranslator.cpp | 2 +- src/add-ons/translators/shared/BaseTranslator.cpp | 2 +- src/add-ons/translators/stxt/STXTTranslator.cpp | 2 +- src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/add-ons/translators/exr/EXRTranslator.cpp b/src/add-ons/translators/exr/EXRTranslator.cpp index 5caf228570..dfc160c8d3 100644 --- a/src/add-ons/translators/exr/EXRTranslator.cpp +++ b/src/add-ons/translators/exr/EXRTranslator.cpp @@ -98,7 +98,7 @@ EXRTranslator::DerivedIdentify(BPositionIO *stream, outInfo->quality = EXR_IN_QUALITY; outInfo->capability = EXR_IN_CAPABILITY; strcpy(outInfo->MIME, "image/exr"); - strncpy(outInfo->name, B_TRANSLATE("EXR image"), + strlcpy(outInfo->name, B_TRANSLATE("EXR image"), sizeof(outInfo->name)); } } catch (const std::exception &e) { diff --git a/src/add-ons/translators/gif/GIFTranslator.cpp b/src/add-ons/translators/gif/GIFTranslator.cpp index 40196210fe..21cc2f4e3b 100644 --- a/src/add-ons/translators/gif/GIFTranslator.cpp +++ b/src/add-ons/translators/gif/GIFTranslator.cpp @@ -170,14 +170,14 @@ Identify(BPositionIO *inSource, const translation_format *inFormat, outInfo->type = GIF_TYPE; outInfo->quality = 0.8; outInfo->capability = 0.8; - strncpy(outInfo->name, B_TRANSLATE("GIF image"), sizeof(outInfo->name)); + strlcpy(outInfo->name, B_TRANSLATE("GIF image"), sizeof(outInfo->name)); strcpy(outInfo->MIME, "image/gif"); } else { outInfo->type = B_TRANSLATOR_BITMAP; outInfo->quality = 0.3; outInfo->capability = 0.3; - strncpy(outInfo->name, B_TRANSLATE("Be Bitmap Format (GIFTranslator)"), + strlcpy(outInfo->name, B_TRANSLATE("Be Bitmap Format (GIFTranslator)"), sizeof(outInfo->name)); strcpy(outInfo->MIME, "image/x-be-bitmap"); } diff --git a/src/add-ons/translators/png/PNGTranslator.cpp b/src/add-ons/translators/png/PNGTranslator.cpp index 9d2034daf2..e83c658686 100644 --- a/src/add-ons/translators/png/PNGTranslator.cpp +++ b/src/add-ons/translators/png/PNGTranslator.cpp @@ -238,7 +238,7 @@ identify_png_header(BPositionIO *inSource, translator_info *outInfo) outInfo->quality = PNG_IN_QUALITY; outInfo->capability = PNG_IN_CAPABILITY; strcpy(outInfo->MIME, "image/png"); - strncpy(outInfo->name, B_TRANSLATE("PNG image"), + strlcpy(outInfo->name, B_TRANSLATE("PNG image"), sizeof(outInfo->name)); } diff --git a/src/add-ons/translators/ppm/PPMTranslator.cpp b/src/add-ons/translators/ppm/PPMTranslator.cpp index 0bb237cadb..ce6c50355e 100644 --- a/src/add-ons/translators/ppm/PPMTranslator.cpp +++ b/src/add-ons/translators/ppm/PPMTranslator.cpp @@ -280,14 +280,14 @@ Identify( /* required */ outInfo->type = PPM_TYPE; outInfo->quality = 0.3; /* no alpha, etc */ outInfo->capability = 0.8; /* we're pretty good at PPM reading, though */ - strncpy(outInfo->name, B_TRANSLATE("PPM image"), sizeof(outInfo->name)); + strlcpy(outInfo->name, B_TRANSLATE("PPM image"), sizeof(outInfo->name)); strcpy(outInfo->MIME, "image/x-portable-pixmap"); } else { outInfo->type = B_TRANSLATOR_BITMAP; outInfo->quality = 0.4; /* B_TRANSLATOR_BITMAP can do alpha, at least */ outInfo->capability = 0.8; /* and we might not know many variations thereof */ - strncpy(outInfo->name, B_TRANSLATE("Be Bitmap Format (PPMTranslator)"), + strlcpy(outInfo->name, B_TRANSLATE("Be Bitmap Format (PPMTranslator)"), sizeof(outInfo->name)); strcpy(outInfo->MIME, "image/x-be-bitmap"); /* this is the MIME type of B_TRANSLATOR_BITMAP */ } diff --git a/src/add-ons/translators/rtf/RTFTranslator.cpp b/src/add-ons/translators/rtf/RTFTranslator.cpp index ca560e0b61..4c3646f68e 100644 --- a/src/add-ons/translators/rtf/RTFTranslator.cpp +++ b/src/add-ons/translators/rtf/RTFTranslator.cpp @@ -135,7 +135,7 @@ RTFTranslator::Identify(BPositionIO *stream, info->group = B_TRANSLATOR_TEXT; info->quality = RTF_IN_QUALITY; info->capability = RTF_IN_CAPABILITY; - strncpy(info->name, B_TRANSLATE("RichTextFormat file"), + strlcpy(info->name, B_TRANSLATE("RichTextFormat file"), sizeof(info->name)); strcpy(info->MIME, "text/rtf"); diff --git a/src/add-ons/translators/sgi/SGITranslator.cpp b/src/add-ons/translators/sgi/SGITranslator.cpp index f9aaefa939..8753ce2157 100644 --- a/src/add-ons/translators/sgi/SGITranslator.cpp +++ b/src/add-ons/translators/sgi/SGITranslator.cpp @@ -203,7 +203,7 @@ identify_sgi_header(BPositionIO *inSource, translator_info *outInfo, uint32 outT outInfo->quality = SGI_IN_QUALITY; outInfo->capability = SGI_IN_CAPABILITY; strcpy(outInfo->MIME, "image/sgi"); - strncpy(outInfo->name, B_TRANSLATE("SGI image"), + strlcpy(outInfo->name, B_TRANSLATE("SGI image"), sizeof(outInfo->name)); } } else { diff --git a/src/add-ons/translators/shared/BaseTranslator.cpp b/src/add-ons/translators/shared/BaseTranslator.cpp index 9aec0c7570..569bb44e33 100644 --- a/src/add-ons/translators/shared/BaseTranslator.cpp +++ b/src/add-ons/translators/shared/BaseTranslator.cpp @@ -305,7 +305,7 @@ BaseTranslator::identify_bits_header(BPositionIO *inSource, outInfo->group = B_TRANSLATOR_BITMAP; outInfo->quality = 0.2; outInfo->capability = 0.2; - strncpy(outInfo->name, B_TRANSLATE("Be Bitmap Format"), + strlcpy(outInfo->name, B_TRANSLATE("Be Bitmap Format"), sizeof(outInfo->name)); strcpy(outInfo->MIME, "image/x-be-bitmap"); diff --git a/src/add-ons/translators/stxt/STXTTranslator.cpp b/src/add-ons/translators/stxt/STXTTranslator.cpp index f466a72cf8..23d29c3e5e 100644 --- a/src/add-ons/translators/stxt/STXTTranslator.cpp +++ b/src/add-ons/translators/stxt/STXTTranslator.cpp @@ -860,7 +860,7 @@ identify_stxt_header(const TranslatorStyledTextStreamHeader &header, outInfo->group = B_TRANSLATOR_TEXT; outInfo->quality = STXT_IN_QUALITY; outInfo->capability = STXT_IN_CAPABILITY; - strncpy(outInfo->name, B_TRANSLATE("Be styled text file"), + strlcpy(outInfo->name, B_TRANSLATE("Be styled text file"), sizeof(outInfo->name)); strcpy(outInfo->MIME, "text/x-vnd.Be-stxt"); diff --git a/src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp b/src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp index 523ac1c4c5..6895faa15d 100644 --- a/src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp +++ b/src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp @@ -134,7 +134,7 @@ identify_wbi_header(BPositionIO* inSource, translator_info* outInfo, outInfo->quality = WBI_IN_QUALITY; outInfo->capability = WBI_IN_CAPABILITY; strcpy(outInfo->MIME, "image/x-wonderbrush"); - strncpy(outInfo->name, B_TRANSLATE("WonderBrush image"), + strlcpy(outInfo->name, B_TRANSLATE("WonderBrush image"), sizeof(outInfo->name)); } } else {