Merge branch 'PHP-7.0' into PHP-7.1

nikic · nikic · commit 63e59c75a530 · 2017-03-16T12:57:36.000+01:00
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -4728,6 +4728,7 @@ PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers)
 PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, char *opt, char *headers) /* {{{ */
 {
 	php_stream *stream = NULL;
+	size_t nbytes;
 
 	switch (opt_err)
 	{
@@ -4747,8 +4748,11 @@ PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, cha
 			if (!stream) {
 				return FAILURE;
 			}
-			php_stream_write(stream, message, message_len);
+			nbytes = php_stream_write(stream, message, message_len);
 			php_stream_close(stream);
+			if (nbytes != message_len) {
+				return FAILURE;
+			}
 			break;
 
 		case 4: /* send to SAPI */

Original file line number	Diff line number	Diff line change
`@@ -4728,6 +4728,7 @@ PHPAPI int _php_error_log(int opt_err, char message, char opt, char *headers)`
`4728`	`4728`	`PHPAPI int _php_error_log_ex(int opt_err, char message, size_t message_len, char opt, char headers) / {{{ */`
`4729`	`4729`	`{`
`4730`	`4730`	`php_stream *stream = NULL;`
	`4731`	`+ size_t nbytes;`
`4731`	`4732`
`4732`	`4733`	`switch (opt_err)`
`4733`	`4734`	`{`
`@@ -4747,8 +4748,11 @@ PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, cha`
`4747`	`4748`	`if (!stream) {`
`4748`	`4749`	`return FAILURE;`
`4749`	`4750`	`}`
`4750`		`- php_stream_write(stream, message, message_len);`
	`4751`	`+ nbytes = php_stream_write(stream, message, message_len);`
`4751`	`4752`	`php_stream_close(stream);`
	`4753`	`+ if (nbytes != message_len) {`
	`4754`	`+ return FAILURE;`
	`4755`	`+ }`
`4752`	`4756`	`break;`
`4753`	`4757`
`4754`	`4758`	`case 4: /* send to SAPI */`