From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 28 Jun 2016 03:11:25 +0000 (+0800)
Subject: Fixed bug #72505 (readfile() mangles files larger than 2G)
X-Git-Tag: php-7.0.9RC1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c73a2f7f45fc4ad6bf45f5f6929606725f285cd7;p=php

Fixed bug #72505 (readfile() mangles files larger than 2G)
---

diff --git a/NEWS b/NEWS
index 68eea45892..816a20f451 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ PHP                                                                        NEWS
   . Fixed bug #72463 (mail fails with invalid argument). (Anatol)
 
 - Standard:
+  . Fixed bug #72505 (readfile() mangles files larger than 2G). (Cschneid)
   . Fixed bug #72306 (Heap overflow through proc_open and $env parameter).
     (Laruence)
 
diff --git a/main/streams/streams.c b/main/streams/streams.c
index d64d5caa6a..e21d21a807 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1396,7 +1396,7 @@ PHPAPI size_t _php_stream_passthru(php_stream * stream STREAMS_DC)
 		if (p) {
 			do {
 				/* output functions return int, so pass in int max */
-				if (0 < (b = PHPWRITE(p, MIN(mapped - bcount, INT_MAX)))) {
+				if (0 < (b = PHPWRITE(p + bcount, MIN(mapped - bcount, INT_MAX)))) {
 					bcount += b;
 				}
 			} while (b > 0 && mapped > bcount);