summaryrefslogtreecommitdiff
path: root/ext/imap/php_imap.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-13 19:38:10 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-13 19:38:31 +0200
commitd9058b61fb3e1ef0697433324716a8843e92c115 (patch)
tree9ebe90a3f76b50715b43c851b26537d5e4e6a09e /ext/imap/php_imap.c
parent8fd8a1b1288f84a6d0892ffc9f61c02846462433 (diff)
parentdb8bf0a9e07f906ad5d771142e5873688aff8033 (diff)
downloadphp-git-d9058b61fb3e1ef0697433324716a8843e92c115.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: 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 6a7cfe7037..fde64aeae1 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3199,6 +3199,9 @@ PHP_FUNCTION(imap_sort)
} else {
spg = mail_newsearchpgm();
}
+ if (spg == NIL) {
+ RETURN_FALSE;
+ }
mypgm = mail_newsortpgm();
mypgm->reverse = rev;