History

Merge pull request #251 from mstorsjo/crt-string-cleanup

Clean up the rest of the usage of crt_safe_util_x

Ethan Hugg committed 12 years ago

Commit 3c402612 parents 0d7bafc e0da5a18 files · +49 −423Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 8 files). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+8−8
@@ -994,20 +994,20 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 993 unmodified lines
994994 str_t strFileName[256] = {0};
995995 const int32_t iDataLength = m_iMaxPicWidth * m_iMaxPicHeight;
996996
997− STRNCPY (strFileName, 256, "pic_in_", STRNLEN ("pic_in_", 255)); // confirmed_safe_unsafe_usage
997+ WelsStrncpy (strFileName, 256, "pic_in_"); // confirmed_safe_unsafe_usage
998998
999999 if (m_iMaxPicWidth == 640) {
1000− STRCAT (strFileName, 256, "360p."); // confirmed_safe_unsafe_usage
1000+ WelsStrcat (strFileName, 256, "360p."); // confirmed_safe_unsafe_usage
10011001 } else if (m_iMaxPicWidth == 320) {
1002− STRCAT (strFileName, 256, "180p."); // confirmed_safe_unsafe_usage
1002+ WelsStrcat (strFileName, 256, "180p."); // confirmed_safe_unsafe_usage
10031003 } else if (m_iMaxPicWidth == 160) {
1004− STRCAT (strFileName, 256, "90p."); // confirmed_safe_unsafe_usage
1004+ WelsStrcat (strFileName, 256, "90p."); // confirmed_safe_unsafe_usage
10051005 }
10061006
10071007 switch (m_iCspInternal) {
10081008 case videoFormatI420:
10091009 case videoFormatYV12:
1010− STRCAT (strFileName, 256, "yuv"); // confirmed_safe_unsafe_usage
1010+ WelsStrcat (strFileName, 256, "yuv"); // confirmed_safe_unsafe_usage
10111011 pFile = WelsFopen (strFileName, "ab+");
10121012 // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_I420, m_iCspInternal= 0x%x\n", m_iCspInternal);
10131013 if (NULL != pFile) {
@@ -1017,7 +1017,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 3 unmodified lines
10171017 }
10181018 break;
10191019 case videoFormatRGB:
1020− STRCAT (strFileName, 256, "rgb"); // confirmed_safe_unsafe_usage
1020+ WelsStrcat (strFileName, 256, "rgb"); // confirmed_safe_unsafe_usage
10211021 pFile = WelsFopen (strFileName, "ab+");
10221022 if (NULL != pFile) {
10231023 fwrite (pSrc, sizeof (uint8_t), iDataLength * 3, pFile);
@@ -1025,7 +1025,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 1 unmodified line
10251025 fclose (pFile);
10261026 }
10271027 case videoFormatBGR:
1028− STRCAT (strFileName, 256, "bgr"); // confirmed_safe_unsafe_usage
1028+ WelsStrcat (strFileName, 256, "bgr"); // confirmed_safe_unsafe_usage
10291029 pFile = WelsFopen (strFileName, "ab+");
10301030 // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_BGR, m_iCspInternal= 0x%x\n", m_iCspInternal);
10311031 if (NULL != pFile) {
@@ -1035,7 +1035,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 3 unmodified lines
10351035 }
10361036 break;
10371037 case videoFormatYUY2:
1038− STRCAT (strFileName, 256, "yuy2"); // confirmed_safe_unsafe_usage
1038+ WelsStrcat (strFileName, 256, "yuy2"); // confirmed_safe_unsafe_usage
10391039 pFile = WelsFopen (strFileName, "ab+");
10401040 if (NULL != pFile) {
10411041 fwrite (pSrc, sizeof (uint8_t), (CALC_BI_STRIDE (m_iMaxPicWidth, 16)) * m_iMaxPicHeight, pFile);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t