summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-15 13:21:27 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-15 13:21:27 +0200
commitf5b2dedc096721ac5af8f2dc13010534961421c1 (patch)
tree6c96e5ea82178af4e1b636931ac163e2b873b9bc /ext
parent42d68443587d6fa982239bae8b377226f421a6bf (diff)
parentecd51aa099854a85585671947f053b69d5b73ceb (diff)
downloadphp-git-f5b2dedc096721ac5af8f2dc13010534961421c1.tar.gz
Merge branch 'PHP-8.0' into master
* PHP-8.0: Fix broken fix for #80239
Diffstat (limited to 'ext')
-rw-r--r--ext/imap/php_imap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 35253b23f8..27ea5b4e15 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1849,7 +1849,6 @@ PHP_FUNCTION(imap_subscribe)
} else {
RETURN_FALSE;
}
- mail_free_address(&addr);
}
/* }}} */
@@ -2251,8 +2250,9 @@ PHP_FUNCTION(imap_rfc822_write_address)
if (string) {
RETVAL_STR(string);
} else {
- RETURN_FALSE;
+ RETVAL_FALSE;
}
+ mail_free_address(&addr);
}
/* }}} */