perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

strncpy boundary

This commit is contained in:
Markus Gans 2018-11-06 01:27:08 +01:00
parent baabf9546e
commit 9fc1910c18
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/foptimove.cpp
View File

@ -690,9 +690,9 @@ int FOptiMove::relativeMove ( char move[]
if ( move ) if ( move )
{ {
if ( *move ) if ( *move )
std::strncat (move, hmove, BUF_SIZE - std::strlen(move)); std::strncat (move, hmove, BUF_SIZE - std::strlen(move) - 1);
else else
std::strncpy (move, hmove, BUF_SIZE); std::strncpy (move, hmove, BUF_SIZE - 1);
move[BUF_SIZE - 1] = '\0'; move[BUF_SIZE - 1] = '\0';
} }
@ -854,7 +854,7 @@ inline void FOptiMove::rightMove ( char hmove[], int& htime
if ( htime_r < htime ) if ( htime_r < htime )
{ {
std::strncpy (hmove, str, BUF_SIZE); std::strncpy (hmove, str, BUF_SIZE - 1);
hmove[BUF_SIZE - 1] = '\0'; hmove[BUF_SIZE - 1] = '\0';
htime = htime_r; htime = htime_r;
} }

6
src/ftermdetection.cpp
View File

@ -145,7 +145,7 @@ void FTermDetection::getSystemTermType()
} }
// 2nd fallback: use vt100 if not found // 2nd fallback: use vt100 if not found
std::strncpy (termtype, C_STR("vt100"), 6); std::strncpy (termtype, C_STR("vt100"), 5);
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -514,7 +514,7 @@ const FString FTermDetection::getXTermColorName (int color)
int stdin_no = FTermios::getStdIn(); int stdin_no = FTermios::getStdIn();
char temp[512] = { }; char temp[512] = { };
std::fprintf (stdout, OSC "4;%d;?" BEL, color); // get color std::fprintf (stdout, OSC "4;%3d;?" BEL, color); // get color
std::fflush(stdout); std::fflush(stdout);
FD_ZERO(&ifds); FD_ZERO(&ifds);
@ -579,7 +579,7 @@ char* FTermDetection::parseAnswerbackMsg (char current_termtype[])
{ {
std::strncpy ( termtype_Answerback std::strncpy ( termtype_Answerback
, new_termtype , new_termtype
, sizeof(termtype_Answerback) ); , sizeof(termtype_Answerback) - 1);
termtype_Answerback[sizeof(termtype_Answerback) - 1] = '\0'; termtype_Answerback[sizeof(termtype_Answerback) - 1] = '\0';
} }
#endif // DEBUG #endif // DEBUG

1
src/include/final/foptimove.h
View File

@ -234,7 +234,6 @@ class FOptiMove
bool automatic_left_margin; bool automatic_left_margin;
bool eat_nl_glitch; bool eat_nl_glitch;
char move_buf[BUF_SIZE]; char move_buf[BUF_SIZE];
int char_duration; int char_duration;
int baudrate; int baudrate;

4
src/include/final/ftermdata.h
View File

@ -363,7 +363,7 @@ inline void FTermData::setTermType (const char name[])
if ( ! name ) if ( ! name )
return; return;
std::strncpy (termtype, name, sizeof(termtype)); std::strncpy (termtype, name, sizeof(termtype) - 1);
termtype[sizeof(termtype) - 1] = '\0'; termtype[sizeof(termtype) - 1] = '\0';
} }
@ -373,7 +373,7 @@ inline void FTermData::setTermFileName (const char file_name[])
if ( ! file_name ) if ( ! file_name )
return; return;
std::strncpy (termfilename, file_name, sizeof(termfilename)); std::strncpy (termfilename, file_name, sizeof(termfilename) - 1);
termfilename[sizeof(termfilename) - 1] = '\0'; termfilename[sizeof(termfilename) - 1] = '\0';
} }

2
test/fstring-test.cpp
View File

@ -1016,7 +1016,7 @@ void FStringTest::formatTest()
str1.sprintf ("There are %d lions in the %s", num, location); str1.sprintf ("There are %d lions in the %s", num, location);
CPPUNIT_ASSERT ( str1 == "There are 3 lions in the zoo" ); CPPUNIT_ASSERT ( str1 == "There are 3 lions in the zoo" );
str1.sprintf (finalcut::FString("%d times"), 42); str1.sprintf (finalcut::FString("%2d times"), 42);
CPPUNIT_ASSERT ( str1 == "42 times" ); CPPUNIT_ASSERT ( str1 == "42 times" );
finalcut::FString str2; finalcut::FString str2;