fly/flightgear
1
0
Fork 0
Code Activity

Fix a possible endless loop due to insufficient space in a char array for some messages

Browse source
This commit is contained in:
daveluff 2003-10-09 21:37:26 +00:00
parent 9d3d4ecc51
commit 9e66194dca
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ATC/transmissionlist.cxx
View file

@ -142,7 +142,7 @@ bool FGTransmissionList::query_station( const int &station, FGTransmission *t,
string FGTransmissionList::gen_text(const int &station, const TransCode code, string FGTransmissionList::gen_text(const int &station, const TransCode code,
const TransPar &tpars, const bool ttext ) const TransPar &tpars, const bool ttext )
{ {
const int cmax = 100; const int cmax = 300;
string message; string message;
char tag[4]; char tag[4];
char crej = '@'; char crej = '@';
@ -167,6 +167,7 @@ string FGTransmissionList::gen_text(const int &station, const TransCode code,
else message = current->get_menutext(); else message = current->get_menutext();
strcpy( &mes[0], message.c_str() ); strcpy( &mes[0], message.c_str() );
int check = 0; // If mes gets overflowed the while loop can go infinite
while ( strchr(&mes[0], crej) != NULL ) { while ( strchr(&mes[0], crej) != NULL ) {
pos = strchr( &mes[0], crej ); pos = strchr( &mes[0], crej );
bcopy(pos, &tag[0], 3); bcopy(pos, &tag[0], 3);
@ -240,6 +241,12 @@ string FGTransmissionList::gen_text(const int &station, const TransCode code,
} }
strcat( &dum[0], &mes[len+3] ); strcat( &dum[0], &mes[len+3] );
strcpy( &mes[0], &dum[0] ); strcpy( &mes[0], &dum[0] );
++check;
if(check > 10) {
SG_LOG(SG_ATC, SG_WARN, "WARNING: Possibly endless loop terminated in FGTransmissionlist::gen_text(...)");
break;
}
} }
//cout << mes << endl; //cout << mes << endl;