[packages/php.git] / php-5.3.7-bug-54946.patch

--- PHP_5_3/main/streams/streams.c	2011/05/29 11:39:49	311544
+++ PHP_5_3/main/streams/streams.c	2011/05/29 12:29:19	311545
@@ -1291,6 +1291,9 @@
 		ptr = *buf = pemalloc_rel_orig(maxlen + 1, persistent);
 		while ((len < maxlen) && !php_stream_eof(src)) {
 			ret = php_stream_read(src, ptr, maxlen - len);
+			if (!ret) {
+				break;
+			}
 			len += ret;
 			ptr += ret;
 		}
Commit	Line	Data
fb98beff ER	1	--- PHP_5_3/main/streams/streams.c 2011/05/29 11:39:49 311544
	2	+++ PHP_5_3/main/streams/streams.c 2011/05/29 12:29:19 311545
	3	@@ -1291,6 +1291,9 @@
	4	ptr = *buf = pemalloc_rel_orig(maxlen + 1, persistent);
	5	while ((len < maxlen) && !php_stream_eof(src)) {
	6	ret = php_stream_read(src, ptr, maxlen - len);
	7	+ if (!ret) {
	8	+ break;
	9	+ }
	10	len += ret;
	11	ptr += ret;
	12	}