Simplify

Author: arnaud-lb

Zend/zend.c

@@ -1453,28 +1453,26 @@ ZEND_API ZEND_COLD void zend_error_zstr_at(
 	}
 
 	/* Emit any delayed error before handling fatal error */
-	if ((type & E_FATAL_ERRORS) && !(type & E_DONT_BAIL)) {
-		if (EG(num_errors)) {
-			uint32_t num_errors = EG(num_errors);
-			zend_error_info **errors = EG(errors);
-			EG(num_errors) = 0;
-			EG(errors) = NULL;
-
-			bool orig_record_errors = EG(record_errors);
-			EG(record_errors) = false;
-
-			/* Disable user error handler before emitting delayed errors, as
-			 * it's unsafe to execute user code after a fatal error. */
-			int orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting);
-			EG(user_error_handler_error_reporting) = 0;
-
-			zend_emit_recorded_errors_ex(num_errors, errors);
-
-			EG(user_error_handler_error_reporting) = orig_user_error_handler_error_reporting;
-			EG(record_errors) = orig_record_errors;
-			EG(num_errors) = num_errors;
-			EG(errors) = errors;
-		}
+	if ((type & E_FATAL_ERRORS) && !(type & E_DONT_BAIL) && EG(num_errors)) {
+		uint32_t num_errors = EG(num_errors);
+		zend_error_info **errors = EG(errors);
+		EG(num_errors) = 0;
+		EG(errors) = NULL;
+
+		bool orig_record_errors = EG(record_errors);
+		EG(record_errors) = false;
+
+		/* Disable user error handler before emitting delayed errors, as
+		 * it's unsafe to execute user code after a fatal error. */
+		int orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting);
+		EG(user_error_handler_error_reporting) = 0;
+
+		zend_emit_recorded_errors_ex(num_errors, errors);
+
+		EG(user_error_handler_error_reporting) = orig_user_error_handler_error_reporting;
+		EG(record_errors) = orig_record_errors;
+		EG(num_errors) = num_errors;
+		EG(errors) = errors;
 	}
 
 	if (EG(record_errors)) {