BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Replace instance of readsome with read in decompressZlib Make decompressZlib more robust

Browse Source
This commit is contained in:
gregorycu 2016-01-04 18:02:12 +11:00 committed by paramat
parent 386d190e09
commit 9c77725653
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/serialization.cpp
View File

@ -133,7 +133,8 @@ void decompressZlib(std::istream &is, std::ostream &os)
if(z.avail_in == 0) if(z.avail_in == 0)
{ {
z.next_in = (Bytef*)input_buffer; z.next_in = (Bytef*)input_buffer;
input_buffer_len = is.readsome(input_buffer, bufsize); is.read(input_buffer, bufsize);
input_buffer_len = is.gcount();
z.avail_in = input_buffer_len; z.avail_in = input_buffer_len;
//dstream<<"read fail="<<is.fail()<<" bad="<<is.bad()<<std::endl; //dstream<<"read fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
} }
@ -166,6 +167,7 @@ void decompressZlib(std::istream &is, std::ostream &os)
//dstream<<"z.avail_in="<<z.avail_in<<std::endl; //dstream<<"z.avail_in="<<z.avail_in<<std::endl;
//dstream<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl; //dstream<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
// Unget all the data that inflate didn't take // Unget all the data that inflate didn't take
is.clear(); // Just in case EOF is set
for(u32 i=0; i < z.avail_in; i++) for(u32 i=0; i < z.avail_in; i++)
{ {
is.unget(); is.unget();