From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 15 Oct 2020 11:18:34 +0000 (+0200)
Subject: Fix broken fix for #80239
X-Git-Tag: php-7.3.25RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b9db65f6889269eefad42cc51a2bd439c9662a9;p=php

Fix broken fix for #80239

No idea why that `git am` failed that badly.
---

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 4acdc01338..d3b3986ad5 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -2305,7 +2305,6 @@ PHP_FUNCTION(imap_subscribe)
 	} else {
 		RETURN_FALSE;
 	}
-	mail_free_address(&addr);
 }
 /* }}} */
 
@@ -2693,8 +2692,9 @@ PHP_FUNCTION(imap_rfc822_write_address)
 	if (string) {
 		RETVAL_STR(string);
 	} else {
-		RETURN_FALSE;
+		RETVAL_FALSE;
 	}
+	mail_free_address(&addr);
 }
 /* }}} */