php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0' into master

Browse Source 
* PHP-8.0:
  Fix #80226: imap_sort() leaks sortpgm memory
This commit is contained in:
Christoph M. Becker
2020-10-12 23:22:19 +02:00
parent 9c3c67b1bf 818eb8f611
commit d523de69d7
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/imap/php_imap.c
+1
View File
@@ -2742,6 +2742,7 @@ PHP_FUNCTION(imap_sort)
slst = mail_sort(imap_le_struct->imap_stream, (charset ? ZSTR_VAL(charset) : NIL), spg, mypgm, flags);
mail_free_sortpgm(&mypgm);
if (spg && !(flags & SE_FREE)) {
mail_free_searchpgm(&spg);
}
ext/imap/tests/bug80226.phpt
+13
View File
@@ -0,0 +1,13 @@
--TEST--
Bug #80226 (imap_sort() leaks sortpgm memory)
--SKIPIF--
<?php
require_once(__DIR__.'/skipif.inc');
?>
--FILE--
<?php
require_once(__DIR__.'/imap_include.inc');
$stream = imap_open($default_mailbox, $username, $password);
imap_sort($stream, SORTFROM, 0);
?>
--EXPECT--