cvs: php-src(PHP_5_0) /ext/imap php_imap.c
| From: | Antony Dovgal | Date: | Tue, 25 Jan 2005 14:22:13 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30138@lists.php.net to get a copy of this message | ||
tony2001 Tue Jan 25 09:22:13 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/imap php_imap.c
Log:
MFH: fix segfault in imap_bodystruct()
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.16&r2=1.184.2.17&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.184.2.16 php-src/ext/imap/php_imap.c:1.184.2.17
--- php-src/ext/imap/php_imap.c:1.184.2.16 Fri Jan 21 05:58:08 2005
+++ php-src/ext/imap/php_imap.c Tue Jan 25 09:22:13 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.184.2.16 2005/01/21 10:58:08 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.184.2.17 2005/01/25 14:22:13 tony2001 Exp $ */
#define IMAP41
@@ -2653,6 +2653,10 @@
object_init(return_value);
body=mail_body(imap_le_struct->imap_stream, Z_LVAL_PP(msg), Z_STRVAL_PP(section));
+ if (body == NULL) {
+ zval_dtor(return_value);
+ RETURN_FALSE;
+ }
if (body->type <= TYPEMAX) {
add_property_long(return_value, "type", body->type);
}