From: gregorycu <gregory.currie@gmail.com>
Date: Mon, 4 Jan 2016 07:02:12 +0000 (+1100)
Subject: Replace instance of readsome with read in decompressZlib Make decompressZlib more... 
X-Git-Tag: 0.4.14~338
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c77725653061baa9ae169a966205a4eb2f6c3fd;p=oweals%2Fminetest.git

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

diff --git a/src/serialization.cpp b/src/serialization.cpp
index c0fbe10e2..79f66fcae 100644
--- a/src/serialization.cpp
+++ b/src/serialization.cpp
@@ -133,7 +133,8 @@ void decompressZlib(std::istream &is, std::ostream &os)
 		if(z.avail_in == 0)
 		{
 			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;
 			//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<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
 			// 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++)
 			{
 				is.unget();