From b66168e86b90d7e5c6046cf24b11375fec92a451 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 17 Aug 2021 11:26:51 +0200
Subject: [PATCH] Fix maybe-uninitialized warning

Some GCC versions don't like zend_try in loop. Avoid the issue
by pulling it out of the loop, we don't particularly care about
skipping further warnings if a bailout occurs, just that it
does not interrupt shutdown.

Closes GH-7380.
---
 ext/imap/php_imap.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index c6693404518..3d2330a0900 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -657,13 +657,13 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 	if (IMAPG(imap_errorstack) != NIL) {
 		/* output any remaining errors at their original error level */
 		if (EG(error_reporting) & E_NOTICE) {
-			ecur = IMAPG(imap_errorstack);
-			while (ecur != NIL) {
-				zend_try {
+			zend_try {
+				ecur = IMAPG(imap_errorstack);
+				while (ecur != NIL) {
 					php_error_docref(NULL, E_NOTICE, "%s (errflg=%ld)", ecur->LTEXT, ecur->errflg);
-				} zend_end_try();
-				ecur = ecur->next;
-			}
+					ecur = ecur->next;
+				}
+			} zend_end_try();
 		}
 		mail_free_errorlist(&IMAPG(imap_errorstack));
 		IMAPG(imap_errorstack) = NIL;
@@ -672,13 +672,13 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 	if (IMAPG(imap_alertstack) != NIL) {
 		/* output any remaining alerts at E_NOTICE level */
 		if (EG(error_reporting) & E_NOTICE) {
-			acur = IMAPG(imap_alertstack);
-			while (acur != NIL) {
-				zend_try {
+			zend_try {
+				acur = IMAPG(imap_alertstack);
+				while (acur != NIL) {
 					php_error_docref(NULL, E_NOTICE, "%s", acur->LTEXT);
-				} zend_end_try();
-				acur = acur->next;
-			}
+					acur = acur->next;
+				}
+			} zend_end_try();
 		}
 		mail_free_stringlist(&IMAPG(imap_alertstack));
 		IMAPG(imap_alertstack) = NIL;