pajoye Thu Apr 30 18:55:44 2009 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/imap php_imap.c Log: - #47940, memory leaks in imap_body http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1482&r2=1.2027.2.547.2.1483&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1482 php-src/NEWS:1.2027.2.547.2.1483 --- php-src/NEWS:1.2027.2.547.2.1482 Thu Apr 30 17:43:25 2009 +++ php-src/NEWS Thu Apr 30 18:55:44 2009 @@ -17,6 +17,7 @@ - Fixed bug #47969 (ezmlm_hash() returns different values depend on OS). (Ilia) - Fixed bug #47946 (ImageConvolution overwrites background). (Ilia) +- Fixed bug #47940 (memory leaks in imap_body). (Pierre, Jake Levitt) - Fixed bug #47937 (system() calls sapi_flush() regardless of output buffering). (Ilia) - Fixed bug #47903 ("@" operator does not work with string offsets). (Felipe) http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.50&r2=1.208.2.7.2.51&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.50 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.50 Tue Apr 28 12:43:10 2009 +++ php-src/ext/imap/php_imap.c Thu Apr 30 18:55:44 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <z...@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.50 2009/04/28 12:43:10 pajoye Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.51 2009/04/30 18:55:44 pajoye Exp $ */ #define IMAP41 @@ -487,7 +487,7 @@ REGISTER_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS); /* plug in our gets */ - mail_parameters(NIL, SET_GETS, (void *) php_mail_gets); + mail_parameters(NIL, SET_GETS, (void *) NIL); /* set default timeout values */ mail_parameters(NIL, SET_OPENTIMEOUT, (void *) FG(default_socket_timeout)); @@ -1266,7 +1266,6 @@ } else { RETVAL_STRINGL(body, body_len, 1); } - free(body); } /* }}} */ @@ -1995,7 +1994,9 @@ } IMAPG(gets_stream) = writer; + mail_parameters(NIL, SET_GETS, (void *) php_mail_gets); mail_fetchbody_full(imap_ptr->imap_stream, msgno, section, NULL, flags); + mail_parameters(NIL, SET_GETS, (void *) NIL); IMAPG(gets_stream) = NULL; if (close_stream) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php