From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 11 Aug 2006 15:07:29 +0000 (+0000)
Subject: MFB: Extend safe_mode/open_basedir checks to imap_reopen() as well.
X-Git-Tag: php-5.2.0RC2~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b4ecd602812a651e066086e7035023d19e51c2d;p=php

MFB: Extend safe_mode/open_basedir checks to imap_reopen() as well.
---

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");