cvs: php-src(PHP_4_4) /ext/imap php_imap.c

iliaa Fri Aug 11 15:07:00 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/imap php_imap.c Log: Extend safe_mode/open_basedir checks to imap_reopen() as well. http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.142.2.44.2.5&r2=1.142.2.44.2.6&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.142.2.44.2.5 php-src/ext/imap/php_imap.c:1.142.2.44.2.6 --- php-src/ext/imap/php_imap.c:1.142.2.44.2.5 Fri Aug 4 20:32:44 2006 +++ php-src/ext/imap/php_imap.c Fri Aug 11 15:07:00 2006 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.142.2.44.2.5 2006/08/04 20:32:44 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.142.2.44.2.6 2006/08/11 15:07:00 iliaa Exp $ */ #define IMAP41 @@ -794,6 +794,14 @@ } imap_le_struct->flags = cl_flags; } + + /* local filename, need to perform open_basedir and safe_mode checks */ + if (Z_STRVAL_PP(mailbox)[0] != '{' && + (php_check_open_basedir(Z_STRVAL_PP(mailbox) TSRMLS_CC) || + (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(mailbox), NULL, CHECKUID_CHECK_FILE_AND_DIR)))) { + RETURN_FALSE; + } + imap_stream = mail_open(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), flags); if (imap_stream == NIL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-open stream");