cvs: php-src(PHP_4_3) /ext/imap php_imap.c
| From: | Antony Dovgal | Date: | Tue, 25 Jan 2005 14:23:37 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30139@lists.php.net to get a copy of this message | ||
tony2001 Tue Jan 25 09:23:37 2005 EDT
Modified files: (Branch: PHP_4_3)
/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.142.2.41&r2=1.142.2.42&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.41 php-src/ext/imap/php_imap.c:1.142.2.42
--- php-src/ext/imap/php_imap.c:1.142.2.41 Thu Jan 20 13:46:14 2005
+++ php-src/ext/imap/php_imap.c Tue Jan 25 09:23:37 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142.2.41 2005/01/20 18:46:14 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.142.2.42 2005/01/25 14:23:37 tony2001 Exp $ */
#define IMAP41
@@ -2623,6 +2623,10 @@
}
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);
}