[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c

[Pierre-Alain Joye]

pajoye          Mon Jun 22 14:09:56 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/imap   php_imap.c 
  Log:
  - #48619, imap_search ALL segfaults
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.49&r2=1.208.2.7.2.26.2.50&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.26.2.49 
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.50
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.49     Sat Jun  6 02:40:48 2009
+++ php-src/ext/imap/php_imap.c Mon Jun 22 14:09:55 2009
@@ -26,7 +26,7 @@
    | PHP 4.0 updates:  Zeev Suraski <z...@zend.com>                       |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.49 2009/06/06 02:40:48 mattwil Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.50 2009/06/22 14:09:55 pajoye Exp $ */
 
 #define IMAP41
 
@@ -3019,7 +3019,7 @@
 
        slst = mail_sort(imap_le_struct->imap_stream, (argc == 6 ? charset : 
NIL), spg, mypgm, (argc >= 4 ? flags : NIL));
 
-       if (spg) {
+       if (spg && !(flags & SE_FREE)) {
                mail_free_searchpgm(&spg);
        }
 
@@ -3995,7 +3995,7 @@
 
        mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset : 
NIL), pgm, flags);
 
-       if (pgm) {
+       if (pgm && !(flags & SE_FREE)) {
                mail_free_searchpgm(&pgm);
        }
 
@@ -4611,7 +4611,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);
        }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php