summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-15 13:19:30 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-15 13:19:30 +0200
commitbc214c8423a7005b58238d8b9c596fc42fc2d44f (patch)
treef1449ece19704b6d537d028238edec3c6c44b2da
parent7899ac4c14b6841d0e86a5003e7f7c6cd823d611 (diff)
parent4b9db65f6889269eefad42cc51a2bd439c9662a9 (diff)
downloadphp-git-bc214c8423a7005b58238d8b9c596fc42fc2d44f.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix broken fix for #80239
-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 9c8bb02514..f19bc4621c 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -2321,7 +2321,6 @@ PHP_FUNCTION(imap_subscribe)
} else {
RETURN_FALSE;
}
- mail_free_address(&addr);
}
/* }}} */
@@ -2711,8 +2710,9 @@ PHP_FUNCTION(imap_rfc822_write_address)
if (string) {
RETVAL_STR(string);
} else {
- RETURN_FALSE;
+ RETVAL_FALSE;
}
+ mail_free_address(&addr);
}
/* }}} */