pajoye Sat Apr 25 15:02:04 2009 UTC Modified files: /php-src/ext/imap php_imap.c Log: - SEARCHPGM struct has to be freed http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.275&r2=1.276&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.275 php-src/ext/imap/php_imap.c:1.276 --- php-src/ext/imap/php_imap.c:1.275 Sat Apr 25 14:53:50 2009 +++ php-src/ext/imap/php_imap.c Sat Apr 25 15:02:03 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <z...@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.275 2009/04/25 14:53:50 pajoye Exp $ */ +/* $Id: php_imap.c,v 1.276 2009/04/25 15:02:03 pajoye Exp $ */ #define IMAP41 @@ -3892,6 +3892,7 @@ char *search_criteria; MESSAGELIST *cur; int argc = ZEND_NUM_ARGS(); + SEARCHPGM *pgm = NIL; if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls", &streamind, &criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) { return; @@ -3902,7 +3903,14 @@ search_criteria = estrndup(criteria, criteria_len); IMAPG(imap_messages) = IMAPG(imap_messages_tail) = NIL; - mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset : NIL), mail_criteria(search_criteria), flags); + pgm = mail_criteria(search_criteria); + + mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset : NIL), pgm, flags); + + if (pgm) { + mail_free_searchpgm(&pgm); + } + if (IMAPG(imap_messages) == NIL) { efree(search_criteria); RETURN_FALSE; @@ -4508,6 +4516,7 @@ char criteria[] = "ALL"; THREADNODE *top; int argc = ZEND_NUM_ARGS(); + SEARCHPGM *pgm = NIL; if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind, &flags) == FAILURE) { return; @@ -4515,7 +4524,11 @@ ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap); - top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, mail_criteria(criteria), flags); + pgm = mail_criteria(criteria); + top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm, flags); + if (pgm) { + mail_free_searchpgm(&pgm); + } if(top == NIL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function returned an empty tree");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php