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

don't deadlock when input stream is truncated

Browse Source
This commit is contained in:
David Rose 2003-09-18 00:14:49 +00:00
parent 26d2fab618
commit 49b96335e9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/express/zStreamBuf.cxx
View File

@ -245,6 +245,7 @@ read_chars(char *start, size_t length) {
_z_source.avail_out = length; _z_source.avail_out = length;
bool eof = (_source->eof() || _source->fail()); bool eof = (_source->eof() || _source->fail());
int flush = 0;
while (_z_source.avail_out > 0) { while (_z_source.avail_out > 0) {
if (_z_source.avail_in == 0 && !eof) { if (_z_source.avail_in == 0 && !eof) {
@ -255,16 +256,20 @@ read_chars(char *start, size_t length) {
_z_source.next_in = (Bytef *)decompress_buffer; _z_source.next_in = (Bytef *)decompress_buffer;
_z_source.avail_in = read_count; _z_source.avail_in = read_count;
} }
int result = inflate(&_z_source, 0); int result = inflate(&_z_source, flush);
size_t bytes_read = length - _z_source.avail_out; size_t bytes_read = length - _z_source.avail_out;
if (result == Z_STREAM_END) { if (result == Z_STREAM_END) {
// Here's the end of the file. // Here's the end of the file.
return bytes_read; return bytes_read;
}
// It might return Z_BUF_ERROR if we passed in Z_FINISH but not a } else if (result == Z_BUF_ERROR && flush == 0) {
// big enough output buffer for everything. // We might get this if no progress is possible, for instance if
if (result < 0 && result != Z_BUF_ERROR) { // the input stream is truncated. In this case, tell zlib to
// dump everything it's got.
flush = Z_FINISH;
} else if (result < 0) {
show_zlib_error("inflate", result, _z_source); show_zlib_error("inflate", result, _z_source);
return bytes_read; return bytes_read;
} }