cvs: php-src(PHP_5_2) /ext/imap php_imap.c

pajoye Mon Jun 22 20:42:04 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/imap php_imap.c Log: - MF53: #48619, imap_search ALL segfaults http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.51&r2=1.208.2.7.2.52&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.51 php-src/ext/imap/php_imap.c:1.208.2.7.2.52 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.51 Thu Apr 30 18:55:44 2009 +++ php-src/ext/imap/php_imap.c Mon Jun 22 20:42:04 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.51 2009/04/30 18:55:44 pajoye Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.52 2009/06/22 20:42:04 pajoye Exp $ */ #define IMAP41 @@ -2670,7 +2670,7 @@ slst = mail_sort(imap_le_struct->imap_stream, (myargc == 6 ? Z_STRVAL_PP(charset) : NIL), spg, mypgm, (myargc >= 4 ? Z_LVAL_PP(flags) : NIL)); - if (spg) { + if (spg && !(flags & SE_FREE)) { mail_free_searchpgm(&spg); } @@ -3712,7 +3712,7 @@ mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? Z_STRVAL_PP(charset) : NIL), pgm, flags); - if (pgm) { + if (pgm && !(flags & SE_FREE)) { mail_free_searchpgm(&pgm); } @@ -4341,7 +4341,7 @@ pgm = mail_criteria(criteria); top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm, flags); - if (pgm) { + if (pgm && !(flags & SE_FREE)) { mail_free_searchpgm(&pgm); }