TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix infinite loop on gameserver disconnect

Browse Source
This commit is contained in:
David Rose 2007-05-18 21:49:34 +00:00
parent 46ea4b8474
commit 3dc989ba67
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
panda/src/downloader/socketStream.cxx
View File

@ -46,7 +46,7 @@ do_receive_datagram(Datagram &dg) {
// Read the first two bytes: the datagram length. // Read the first two bytes: the datagram length.
while (_data_so_far.length() < 2) { while (_data_so_far.length() < 2) {
int ch = _istream->get(); int ch = _istream->get();
if (_istream->eof()) { if (_istream->eof() || _istream->fail()) {
_istream->clear(); _istream->clear();
return false; return false;
} }
@ -66,13 +66,28 @@ do_receive_datagram(Datagram &dg) {
} }
// Read the next n bytes until the datagram is filled. // Read the next n bytes until the datagram is filled.
while (_data_so_far.length() < _data_expected) {
int ch = _istream->get(); static const size_t buffer_size = 1024;
if (_istream->eof()) { char buffer[buffer_size];
_istream->clear();
return false; size_t read_count = min(_data_expected - _data_so_far.length(),
} buffer_size);
_data_so_far += (char)ch; _istream->read(buffer, read_count);
size_t count = _istream->gcount();
while (count != 0) {
_data_so_far.append(buffer, count);
read_count = min(_data_expected - _data_so_far.length(),
buffer_size);
_istream->read(buffer, read_count);
count = _istream->gcount();
}
if (_data_so_far.length() < _data_expected) {
// Not yet here. Clear the istream error flag and return false to
// indicate more coming.
_istream->clear();
return false;
} }
dg.clear(); dg.clear();