From 018cead199f4ee24f0286cbd033355eae7f8fdae Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 12:50:02 +0100 Subject: Merging upstream version 1.17~pre1. Signed-off-by: Daniel Baumann --- decoder.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'decoder.cc') 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; -- cgit v1.2.3