show_source() safe-mode fix

@ show_source() was evading safe-mode - fixed (Rasmus)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index cbb9922da6bb0ec27db99d1ff00ec04aec643418..27452efa196bc224bed35004939e759fdfe567c0 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1866,6 +1866,14 @@ PHP_FUNCTION(highlight_file)
        }
        convert_to_string(filename);
 
+       if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_P(filename), NULL, CHECKUID_ALLOW_ONLY_FILE))) {
+               RETURN_FALSE;
+       }
+
+       if (php_check_open_basedir(Z_STRVAL_P(filename) TSRMLS_CC)) {
+               RETURN_FALSE;
+       }
+
        if (i) {
                php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC);
        }

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 41e8fb7436b85c763bbab9cd40f33a02352cb0c4..9ec1458788d8e192cd0269c6d3d2bbe050957e38 100644 (file)
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Sun May  5 18:40:01 2002 */
-#line 1 "/home/thies/devel/php4/ext/standard/url_scanner_ex.re"
+/* Generated by re2c 0.5 on Wed May  8 08:08:09 2002 */
+#line 1 "/home/rasmus/php4/ext/standard/url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |