From: Pierre Joye Date: Sun, 7 Feb 2010 20:45:46 +0000 (+0000) Subject: - prevent unexpectable behaviors (for the user) with invalid path and update tests... X-Git-Tag: php-5.3.2RC2~22 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8682814f3569f0bacec66c158984ea6c5d55f55;p=php - prevent unexpectable behaviors (for the user) with invalid path and update tests (portability) --- diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt index 1474a6955b..997c391306 100644 Binary files a/ext/standard/tests/array/array_flip_variation2.phpt and b/ext/standard/tests/array/array_flip_variation2.phpt differ diff --git a/ext/standard/tests/array/uasort_variation5.phpt b/ext/standard/tests/array/uasort_variation5.phpt index 22d9da31c5..e6996a55fe 100644 --- a/ext/standard/tests/array/uasort_variation5.phpt +++ b/ext/standard/tests/array/uasort_variation5.phpt @@ -139,7 +139,7 @@ array(4) { [1]=> string(7) "Heredoc" [3]=> - string(43) "heredoc string with!@# and 123 + string(4%d) "heredoc string with!@# and 123 Test this!!!" } Done diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt index 290095629e..ccbb621850 100644 Binary files a/ext/standard/tests/file/rename_variation13-win32.phpt and b/ext/standard/tests/file/rename_variation13-win32.phpt differ diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt index ec7718f970..080bce0fb8 100644 --- a/ext/standard/tests/file/tempnam_variation3-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation3-win32.phpt @@ -39,11 +39,20 @@ for( $i=0; $i "; - print($file_name); - echo "\n"; + /* creating the files in existing dir */ + if (file_exists($file_name) && !$res_arr[$i]) { + echo "Failed\n"; + } + if ($res_arr[$i]) { + $file_dir = dirname($file_name); + if (realpath($file_dir) == $file_path || realpath($file_dir . "\\") == $file_path) { + echo "OK\n"; + } else { + echo "Failed, not created in the correct directory " . realpath($file_dir) . ' vs ' . $file_path ."\n"; + } + + if (!is_writable($file_name)) { + printf("%o\n", fileperms($file_name) ); echo "File permissions are => "; printf("%o", fileperms($file_name) ); @@ -94,9 +103,8 @@ File name is => %s\%s File permissions are => 100666 File created in => directory specified -- Iteration 5 -- -File name is => %s\%s -File permissions are => 100666 -File created in => directory specified +Failed, not created in the correct directory %s vs %s +0 -- Iteration 6 -- File name is => %s\%s File permissions are => 100666 diff --git a/ext/standard/tests/general_functions/bug49847.phpt b/ext/standard/tests/general_functions/bug49847.phpt index 637abd24ea..8895202d0c 100644 --- a/ext/standard/tests/general_functions/bug49847.phpt +++ b/ext/standard/tests/general_functions/bug49847.phpt @@ -2,35 +2,24 @@ Bug #49847 (exec() fails on lines larger then 4095 bytes) --FILE-- ---EXPECT-- -array(1) { - [0]=> - string(4098) " 1" +$iswin = substr(PHP_OS, 0, 3) == "WIN"; + +if ($iswin) { + $f = dirname(__FILE__) . '\\bug49847.tmp'; + $s = str_repeat(' ', 4097); + $s .= '1'; + file_put_contents($f, $s); + exec('more ' . $f, $output); +} else { + exec("printf %4098d 1", $output); } ---TEST-- -Bug #49847 (exec() fails on lines larger then 4095 bytes) ---FILE-- - ---EXPECT-- -array(1) { - [0]=> - string(4098) " 1" +if ($iswin) { + unlink($f); } ---TEST-- -Bug #49847 (exec() fails on lines larger then 4095 bytes) ---FILE-- - ---EXPECT-- +--EXPECTF-- array(1) { [0]=> - string(4098) " 1" + string(4098) "%s 1" } diff --git a/ext/standard/tests/general_functions/bug50732.phpt b/ext/standard/tests/general_functions/bug50732.phpt index e036b47ed6..ed8341decb 100644 --- a/ext/standard/tests/general_functions/bug50732.phpt +++ b/ext/standard/tests/general_functions/bug50732.phpt @@ -10,27 +10,3 @@ array(1) { [0]=> string(1) "x" } ---TEST-- -Bug #50732 (exec() adds single byte twice to $output array) ---FILE-- - ---EXPECT-- -array(1) { - [0]=> - string(1) "x" -} ---TEST-- -Bug #50732 (exec() adds single byte twice to $output array) ---FILE-- - ---EXPECT-- -array(1) { - [0]=> - string(1) "x" -} diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt index 5a95756276..3a958901a2 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic.phpt @@ -5,6 +5,10 @@ Italian PHP TestFest 2009 Cesena 19-20-21 june Fabio Fabbrucci (fabbrucci@grupporetina.com) Michele Orselli (mo@ideato.it) Simone Gentili (sensorario@gmail.com) +--SKIPIF-- + --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- +--INI-- +default_socket_timeout=2 +--FILE-- + +--EXPECTF-- +Warning: opendir(): connect() failed: %s + in %s on line %d + +Warning: opendir(ftp://...@localhost/): failed to open dir: operation failed in %s on line %d +bool(false) + +Warning: opendir(): connect() failed: %s + in %s on line %d + +Warning: opendir(ftp://...@localhost/): failed to open dir: operation failed in %s on line %d +bool(false) diff --git a/ext/standard/tests/streams/stream_resolve_include_path.phpt b/ext/standard/tests/streams/stream_resolve_include_path.phpt index 01c05a5ca2..aea5cdd96c 100644 --- a/ext/standard/tests/streams/stream_resolve_include_path.phpt +++ b/ext/standard/tests/streams/stream_resolve_include_path.phpt @@ -32,6 +32,6 @@ rmdir($include_path); Warning: stream_resolve_include_path() expects exactly 1 parameter, 0 given in %s on line %d NULL bool(false) -string(%d) "%s/test_path/file" -string(%d) "%s/test_path/nested/file" +string(%d) "%stest_path%sfile" +string(%d) "%stest_path%snested%sfile" diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c index 942eeacea4..cf17f27d66 100644 --- a/main/php_open_temporary_file.c +++ b/main/php_open_temporary_file.c @@ -113,6 +113,13 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char ** return -1; } +#ifdef PHP_WIN32 + if (!php_win32_check_trailing_space(pfx, (const int)strlen(pfx))) { + SetLastError(ERROR_INVALID_NAME); + return -1; + } +#endif + if (!VCWD_GETCWD(cwd, MAXPATHLEN)) { cwd[0] = '\0'; } @@ -138,12 +145,14 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char ** } #ifdef PHP_WIN32 + if (GetTempFileName(new_state.cwd, pfx, 0, opened_path)) { /* Some versions of windows set the temp file to be read-only, * which means that opening it will fail... */ VCWD_CHMOD(opened_path, 0600); fd = VCWD_OPEN_MODE(opened_path, open_flags, 0600); } + #elif defined(HAVE_MKSTEMP) fd = mkstemp(opened_path); #else @@ -151,6 +160,7 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char ** fd = VCWD_OPEN(opened_path, open_flags); } #endif + if (fd == -1 || !opened_path_p) { efree(opened_path); } else { diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 8d94c27c22..f3722d9fc5 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -39,6 +39,9 @@ #include "SAPI.h" #include "php_streams_int.h" +#ifdef PHP_WIN32 +# include "win32/winutil.h" +#endif #define php_stream_fopen_from_fd_int(fd, mode, persistent_id) _php_stream_fopen_from_fd_int((fd), (mode), (persistent_id) STREAMS_CC TSRMLS_CC) #define php_stream_fopen_from_fd_int_rel(fd, mode, persistent_id) _php_stream_fopen_from_fd_int((fd), (mode), (persistent_id) STREAMS_REL_CC TSRMLS_CC) @@ -1060,6 +1063,17 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, char *url_from, c return 0; } +#ifdef PHP_WIN32 + if (!php_win32_check_trailing_space(url_from, strlen(url_from))) { + php_win32_docref2_from_error(ERROR_INVALID_NAME, url_from, url_to TSRMLS_CC); + return 0; + } + if (!php_win32_check_trailing_space(url_to, strlen(url_to))) { + php_win32_docref2_from_error(ERROR_INVALID_NAME, url_from, url_to TSRMLS_CC); + return 0; + } +#endif + if ((p = strstr(url_from, "://")) != NULL) { url_from = p + 3; } @@ -1225,6 +1239,9 @@ static int php_plain_files_mkdir(php_stream_wrapper *wrapper, char *dir, int mod static int php_plain_files_rmdir(php_stream_wrapper *wrapper, char *url, int options, php_stream_context *context TSRMLS_DC) { +#if PHP_WIN32 + int url_len = strlen(url); +#endif if (PG(safe_mode) &&(!php_checkuid(url, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { return 0; } @@ -1233,6 +1250,13 @@ static int php_plain_files_rmdir(php_stream_wrapper *wrapper, char *url, int opt return 0; } +#if PHP_WIN32 + if (!php_win32_check_trailing_space(url, url_len)) { + php_error_docref1(NULL TSRMLS_CC, url, E_WARNING, "%s", strerror(ENOENT)); + return 0; + } +#endif + if (VCWD_RMDIR(url) < 0) { php_error_docref1(NULL TSRMLS_CC, url, E_WARNING, "%s", strerror(errno)); return 0; diff --git a/win32/winutil.c b/win32/winutil.c index 7e1cf3fc91..24b00edfae 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -31,3 +31,18 @@ PHPAPI char *php_win_err(int error) return (buf ? (char *) buf : ""); } + +int php_win32_check_trailing_space(const char * path, const int path_len) { + if (path_len < 1) { + return 1; + } + if (path) { + if (path[0] == ' ' || path[path_len - 1] == ' ') { + return 0; + } else { + return 1; + } + } else { + return 0; + } +} diff --git a/win32/winutil.h b/win32/winutil.h index 36b10200cb..8ee75752da 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -19,3 +19,4 @@ PHPAPI char *php_win_err(int error); #define php_win_err() php_win_err(GetLastError()) +int php_win32_check_trailing_space(const char * path, const int path_len);