summaryrefslogtreecommitdiff
path: root/ext/imap/php_imap.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-13 19:40:49 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-13 19:41:27 +0200
commit5aec24c477e72e71a846361f93ef8861b7a262e5 (patch)
treeda145346c56b1b4ece8f7715090d411f2cdd13a2 /ext/imap/php_imap.c
parent9b4094c3d74cb7e71dd2dc6ae6673a17575b2a13 (diff)
parentd9058b61fb3e1ef0697433324716a8843e92c115 (diff)
downloadphp-git-5aec24c477e72e71a846361f93ef8861b7a262e5.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: 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 7c8768fbfb..a4d636849c 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;