fly/flightgear
1
0
Fork 0
Code Activity

reorganize the code a bit to prevent an infinite loop in ascii mode

Browse source
This commit is contained in:
ehofman 2010-02-07 12:40:42 +00:00 • committed by Tim Moore
parent fba05c527f
commit 6072e3d969
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/Network/generic.cxx
View file

@ -467,25 +467,24 @@ bool FGGeneric::process() {
}
}
} else {
do {
if (!binary_mode) {
length = io->readline( buf, FG_MAX_MSG_SIZE );
if ( length > 0 ) {
parse_message();
}
} else {
length = io->read( buf, binary_record_length );
if ( length == binary_record_length ) {
parse_message();
} else if ( length > 0 ) {
SG_LOG( SG_IO, SG_ALERT,
"Generic protocol: Received binary "
"record of unexpected size, expected: "
<< binary_record_length << " but received: "
<< length);
}
if (!binary_mode) {
while ((length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) {
parse_message();
}
} while ( length == binary_record_length );
} else {
while ((length = io->read( buf, binary_record_length ))
== binary_record_length ) {
parse_message();
}
if ( length > 0 ) {
SG_LOG( SG_IO, SG_ALERT,
"Generic protocol: Received binary "
"record of unexpected size, expected: "
<< binary_record_length << " but received: "
<< length);
}
}
}
}
return true;