summaryrefslogtreecommitdiff
path: root/ext/imap/php_imap.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-13 19:41:54 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-13 19:41:54 +0200
commit6af54d864d9eb0590766810489b4bc16db0d1288 (patch)
treea18b90944b4ab39d12ce236853b169f3ebc82915 /ext/imap/php_imap.c
parent4371a4b2411d8b01e71ac1dc9237839d89889778 (diff)
parent5aec24c477e72e71a846361f93ef8861b7a262e5 (diff)
downloadphp-git-6af54d864d9eb0590766810489b4bc16db0d1288.tar.gz
Merge branch 'PHP-8.0' into master
* PHP-8.0: Fix #64076: imap_sort() does not return FALSE on failure
Diffstat (limited to 'ext/imap/php_imap.c')
-rw-r--r--ext/imap/php_imap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 034fa0eeb0..4597fdbe3c 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -2740,6 +2740,9 @@ PHP_FUNCTION(imap_sort)
} else {
spg = mail_newsearchpgm();
}
+ if (spg == NIL) {
+ RETURN_FALSE;
+ }
mypgm = mail_newsortpgm();
mypgm->reverse = rev;