Fixed bug #31054 (safe_mode & open_basedir checks only check first

include_path value).

diff --git a/NEWS b/NEWS
index a8ee9b013d270c723807371947482b4edcc25a76..446ac3958dd96574fad1d84ef49f3a771c795c6c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,8 @@ PHP                                                                        NEWS
   PHP). (Marcus)
 - Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread).
   (Jani)
+- Fixed bug #31054 (safe_mode & open_basedir checks only check first 
+  include_path value). (Ilia)
 - Fixed bug #29683 (headers_list() returns empty array). (Tony)
 - Fixed bug #28355 (glob wont error if dir is not readable). (Hartmut)
 - Fixed bugs #20382, #28024, #30532, #32086, #32270, #32555, #32588, #33056

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 8ef2ae080eb529b6d7ecb68c674e1f0ef4ae39e0..7bc149fa568f66feba559a103b238b736c7dde20 100644 (file)
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -1297,24 +1297,24 @@ not_relative_path:
                        end++;
                }
                snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename);
-               
-               if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(trypath TSRMLS_CC)) {
-                       stream = NULL;
-                       goto stream_done;
+
+               if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir_ex(trypath, 0 TSRMLS_CC)) {
+                       ptr = end;
+                       continue;
                }
                
                if (PG(safe_mode)) {
                        if (VCWD_STAT(trypath, &sb) == 0) {
                                /* file exists ... check permission */
                                if ((php_check_safe_mode_include_dir(trypath TSRMLS_CC) == 0) ||
-                                               php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM)) {
+                                               php_checkuid_ex(trypath, mode, CHECKUID_CHECK_MODE_PARAM, CHECKUID_NO_ERRORS)) {
                                        /* UID ok, or trypath is in safe_mode_include_dir */
                                        stream = php_stream_fopen_rel(trypath, mode, opened_path, options);
-                               } else {
-                                       stream = NULL;
+                                       goto stream_done;
                                }
-                               goto stream_done;
                        }
+                       ptr = end;
+                       continue;
                }
                stream = php_stream_fopen_rel(trypath, mode, opened_path, options);
                if (stream) {