Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix GH-7875: mails are sent even if failure to log throws exception

Author: cmb69

NEWS

@@ -18,6 +18,8 @@ PHP                                                                        NEWS
 
 - Standard:
   . Fixed bug GH-7899 (Regression in unpack for negative int value). (Remi)
+  . Fixed bug GH-7875 (mails are sent even if failure to log throws exception).
+    (cmb)
 
 06 Jan 2022, PHP 8.1.2RC1
 

ext/standard/mail.c

@@ -425,6 +425,10 @@ PHPAPI int php_mail(const char *to, const char *subject, const char *message, co
 		efree(logline);
 	}
 
+	if (EG(exception)) {
+		MAIL_RET(0);
+	}
+
 	if (PG(mail_x_header)) {
 		const char *tmp = zend_get_executed_filename();
 		zend_string *f;

ext/standard/tests/mail/gh7875.phpt

@@ -0,0 +1,35 @@
+--TEST--
+GH-7875 (mails are sent even if failure to log throws exception)
+--INI--
+sendmail_path={MAIL:{PWD}/gh7875.mail.out}
+mail.log={PWD}/gh7875.mail.log
+--FILE--
+<?php
+function exception_error_handler($severity, $message, $file, $line) {
+    if (!(error_reporting() & $severity)) {
+        return;
+    }
+    throw new ErrorException($message, 0, $severity, $file, $line);
+}
+set_error_handler("exception_error_handler");
+
+touch(__DIR__ . "/gh7875.mail.log");
+chmod(__DIR__ . "/gh7875.mail.log", 0444);
+
+try {
+	mail('[email protected]', 'Subject', 'Body', []);
+	echo 'Not Reached';
+} catch (\Exception $e) {
+	echo $e->getMessage(), PHP_EOL;
+    var_dump(file_exists(__DIR__ . "/gh7875.mail.out"));
+}
+?>
+--CLEAN--
+<?php
+@chmod(__DIR__ . "/gh7875.mail.log", 0644);
+@unlink(__DIR__ . "/gh7875.mail.log");
+@unlink(__DIR__ . "/gh7875.mail.out");
+?>
+--EXPECTF--
+mail(%s): Failed to open stream: Permission denied
+bool(false)