Merging upstream version 1.17~pre1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 1 insertions, 2 deletions

diff --git a/decoder.cc b/decoder.cc
index 3555a87..f7e8f54 100644
--- a/decoder.cc
+++ b/decoder.cc
@@ -60,8 +60,7 @@ long readblock( const int fd, uint8_t * const buf, const long size )
   errno = 0;
   while( sz < size )
     {
-    const int psz = std::min( 65536L, size - sz );
-    const int n = read( fd, buf + sz, psz );
+    const int n = read( fd, buf + sz, std::min( 1L << 20, size - sz ) );
     if( n > 0 ) sz += n;
     else if( n == 0 ) break;				// EOF
     else if( errno != EINTR ) break;