summaryrefslogtreecommitdiff
path: root/ext/imap/php_imap.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-15 13:20:58 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-15 13:20:58 +0200
commitecd51aa099854a85585671947f053b69d5b73ceb (patch)
treebfaffae279b98ed81a352ed2bc178c8ea5ee61a5 /ext/imap/php_imap.c
parentb7c1834c6aafd4f423629cf6719084dd16ba7030 (diff)
parentbc214c8423a7005b58238d8b9c596fc42fc2d44f (diff)
downloadphp-git-ecd51aa099854a85585671947f053b69d5b73ceb.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Fix broken fix for #80239
Diffstat (limited to 'ext/imap/php_imap.c')
-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 41ef762712..18502b9fd9 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);
}
/* }}} */