Skip to content

Commit ade146c

Browse files
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Ignore memory leaks reported for some libc-client functions
2 parents 62ae21b + 9c7b607 commit ade146c

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

ext/imap/php_imap.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,9 @@ PHP_FUNCTION(imap_open)
798798
}
799799
#endif
800800

801+
ZEND_IGNORE_LEAKS_BEGIN();
801802
imap_stream = mail_open(NIL, ZSTR_VAL(mailbox), flags);
803+
ZEND_IGNORE_LEAKS_END();
802804

803805
if (imap_stream == NIL) {
804806
php_error_docref(NULL, E_WARNING, "Couldn't open stream %s", ZSTR_VAL(mailbox));
@@ -1757,7 +1759,9 @@ PHP_FUNCTION(imap_lsub)
17571759
IMAPG(folderlist_style) = FLIST_ARRAY;
17581760

17591761
IMAPG(imap_sfolders) = NIL;
1762+
ZEND_IGNORE_LEAKS_BEGIN();
17601763
mail_lsub(imap_le_struct->imap_stream, ZSTR_VAL(ref), ZSTR_VAL(pat));
1764+
ZEND_IGNORE_LEAKS_END();
17611765
if (IMAPG(imap_sfolders) == NIL) {
17621766
RETURN_FALSE;
17631767
}
@@ -1795,7 +1799,9 @@ PHP_FUNCTION(imap_getsubscribed)
17951799
IMAPG(folderlist_style) = FLIST_OBJECT;
17961800

17971801
IMAPG(imap_sfolder_objects) = IMAPG(imap_sfolder_objects_tail) = NIL;
1802+
ZEND_IGNORE_LEAKS_BEGIN();
17981803
mail_lsub(imap_le_struct->imap_stream, ZSTR_VAL(ref), ZSTR_VAL(pat));
1804+
ZEND_IGNORE_LEAKS_END();
17991805
if (IMAPG(imap_sfolder_objects) == NIL) {
18001806
RETURN_FALSE;
18011807
}

0 commit comments

Comments
 (0)