diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-13 13:12:39 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-13 13:12:39 +0200 |
| commit | ade146c9ed368609f20d76e5b59ddf94abfbc937 (patch) | |
| tree | bcd8f9f109c3f0e7104800f2374538dffc02935b | |
| parent | 62ae21bbf21b51be548d7788d20175a438fee5b9 (diff) | |
| parent | 9c7b6073203ed3db749c26e88d4f0c2514a60101 (diff) | |
| download | php-git-ade146c9ed368609f20d76e5b59ddf94abfbc937.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Ignore memory leaks reported for some libc-client functions
| -rw-r--r-- | ext/imap/php_imap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 33a73de2a7..7c8768fbfb 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -798,7 +798,9 @@ PHP_FUNCTION(imap_open) } #endif + ZEND_IGNORE_LEAKS_BEGIN(); imap_stream = mail_open(NIL, ZSTR_VAL(mailbox), flags); + ZEND_IGNORE_LEAKS_END(); if (imap_stream == NIL) { php_error_docref(NULL, E_WARNING, "Couldn't open stream %s", ZSTR_VAL(mailbox)); @@ -1757,7 +1759,9 @@ PHP_FUNCTION(imap_lsub) IMAPG(folderlist_style) = FLIST_ARRAY; IMAPG(imap_sfolders) = NIL; + ZEND_IGNORE_LEAKS_BEGIN(); mail_lsub(imap_le_struct->imap_stream, ZSTR_VAL(ref), ZSTR_VAL(pat)); + ZEND_IGNORE_LEAKS_END(); if (IMAPG(imap_sfolders) == NIL) { RETURN_FALSE; } @@ -1795,7 +1799,9 @@ PHP_FUNCTION(imap_getsubscribed) IMAPG(folderlist_style) = FLIST_OBJECT; IMAPG(imap_sfolder_objects) = IMAPG(imap_sfolder_objects_tail) = NIL; + ZEND_IGNORE_LEAKS_BEGIN(); mail_lsub(imap_le_struct->imap_stream, ZSTR_VAL(ref), ZSTR_VAL(pat)); + ZEND_IGNORE_LEAKS_END(); if (IMAPG(imap_sfolder_objects) == NIL) { RETURN_FALSE; } |