summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2006-08-11 15:07:29 +0000
committerIlia Alshanetsky <iliaa@php.net>2006-08-11 15:07:29 +0000
commit5b4ecd602812a651e066086e7035023d19e51c2d (patch)
tree31e4720804d76321293dfaa9aa82f5a2d129e208
parenta6088ffc5a70b839d11c560090036ae445e1ebd7 (diff)
downloadphp-git-5b4ecd602812a651e066086e7035023d19e51c2d.tar.gz
MFB: Extend safe_mode/open_basedir checks to imap_reopen() as well.
-rw-r--r--ext/imap/php_imap.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index ed8da2daff..21efa0b244 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -826,6 +826,14 @@ PHP_FUNCTION(imap_reopen)
}
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");