Return FALSE if error_log fails to write all bytes

adsr · nikic · commit 98f4ce9363b0 · 2017-03-16T12:56:36.000+01:00
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -4682,6 +4682,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)
 	{
@@ -4701,8 +4702,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
`@@ -4682,6 +4682,7 @@ PHPAPI int _php_error_log(int opt_err, char message, char opt, char *headers)`
`4682`	`4682`	`PHPAPI int _php_error_log_ex(int opt_err, char message, size_t message_len, char opt, char headers) / {{{ */`
`4683`	`4683`	`{`
`4684`	`4684`	`php_stream *stream = NULL;`
	`4685`	`+ size_t nbytes;`
`4685`	`4686`
`4686`	`4687`	`switch (opt_err)`
`4687`	`4688`	`{`
`@@ -4701,8 +4702,11 @@ PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, cha`
`4701`	`4702`	`if (!stream) {`
`4702`	`4703`	`return FAILURE;`
`4703`	`4704`	`}`
`4704`		`- php_stream_write(stream, message, message_len);`
	`4705`	`+ nbytes = php_stream_write(stream, message, message_len);`
`4705`	`4706`	`php_stream_close(stream);`
	`4707`	`+ if (nbytes != message_len) {`
	`4708`	`+ return FAILURE;`
	`4709`	`+ }`
`4706`	`4710`	`break;`
`4707`	`4711`
`4708`	`4712`	`case 4: /* send to SAPI */`