cvs: php-src /ext/imap php_imap.c
| From: | Pierre-Alain Joye | Date: | Mon, 22 Jun 2009 20:35:46 +0000 |
| Subject: | cvs: php-src /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58903@lists.php.net to get a copy of this message | ||
pajoye Mon Jun 22 20:35:46 2009 UTC
Modified files:
/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.291&r2=1.292&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.291 php-src/ext/imap/php_imap.c:1.292
--- php-src/ext/imap/php_imap.c:1.291 Sat Jun 6 02:40:13 2009
+++ php-src/ext/imap/php_imap.c Mon Jun 22 20:35:46 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.291 2009/06/06 02:40:13 mattwil Exp $ */
+/* $Id: php_imap.c,v 1.292 2009/06/22 20:35:46 pajoye Exp $ */
#define IMAP41
@@ -3028,7 +3028,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);
}
@@ -4004,7 +4004,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);
}
@@ -4620,7 +4620,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);
}