From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 4 Aug 2006 20:31:19 +0000 (+0000)
Subject: Fixed bug #37265 (Added missing safe_mode & open_basedir checks to
X-Git-Tag: php-5.2.0RC2~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b20b73cdb1677c0fdf4a8903face6b4c731aca37;p=php

Fixed bug #37265 (Added missing safe_mode & open_basedir checks to
imap_body()).
---

diff --git a/NEWS b/NEWS
index 0e49206f26..7b1e47709e 100644
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,8 @@ PHP                                                                        NEWS
   compatibility issue). (Jani, patch by scott dot moynes+php at gmail dot com)
 - Fixed bug #37445 (Fixed crash in pdo_mysql resulting from premature object
   destruction). (Ilia)
+- Fixed bug #37265 (Added missing safe_mode & open_basedir checks to
+  imap_body()). (Ilia)
 
 24 Jul 2006, PHP 5.2.0RC1
 - Updated bundled MySQL client library to version 5.0.22 in the Windows
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index d4dc2cb000..ed8da2daff 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -763,6 +763,13 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		efree(IMAPG(imap_password));
 	}
 
+	/* 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;
+	}
+
 	IMAPG(imap_user)     = estrndup(Z_STRVAL_PP(user), Z_STRLEN_PP(user));
 	IMAPG(imap_password) = estrndup(Z_STRVAL_PP(passwd), Z_STRLEN_PP(passwd));