archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

dirname() should not normalize paths

Browse source 
This is the BC piece with the case where dirname() is used with an URL.
This commit is contained in:
Anatol Belski 2017-01-24 17:56:00 +01:00
parent 403f352482
commit ec78507bd4
3 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/standard/tests/dir/bug72625.phpt
View file

@ -45,9 +45,9 @@ while ($tmp > $base) {
string(%d) "%s/_test/documents/projects/myproject/vendor/name/library/classpath"
bool(true)
string(%d) "%s\_test\documents\projects\myproject\vendor\name\library\classpath"
string(%d) "%s\_test\documents\projects\myproject\vendor\name\library"
string(%d) "%s/_test/documents/projects/myproject/vendor/name/library"
string(%d) "%s/_test/documents/projects/myproject/vendor/name/library/classpath/../../../../../../../../_test/documents/projects/myproject/vendor/name/library/../../../../../../../_test/documents/projects/myproject/vendor/name/library/classpath"
bool(true)
string(%d) "%s\_test\documents\projects\myproject\vendor\name\library\classpath"
string(%d) "%s\_test\documents\projects\myproject\vendor\name\library"
string(%d) "%s/_test/documents/projects/myproject/vendor/name/library"
===DONE===

27
ext/standard/tests/file/dirname_no_path_normalization-win32.phpt Normal file
View file

@ -0,0 +1,27 @@
--TEST--
Test dirname() function : regression with path normalization
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) != "WIN")
die("skip Only valid for Windows");
?>
--FILE--
<?php
$s = '/php_sanity/sanity.php?';
while (dirname($s) == "/php_sanity" && strlen($s) < 10000) {
$s .= str_repeat('X', 250);
}
if (strlen($s) >= 10000) {
echo "OK\n";
} else {
print "ERROR: " . PHP_EOL;
var_dump(dirname($s));
var_dump(strlen($s));
}
?>
===DONE===
--EXPECT--
OK
===DONE===

3
win32/ioutil.c
View file

@ -445,7 +445,8 @@ PW32IO size_t php_win32_ioutil_dirname(char *path, size_t len)
start = path;
startw = pathw = php_win32_ioutil_conv_any_to_w(path, len, &pathw_len);
/* Don't really care about the path normalization, pure parsing here. */
startw = pathw = php_win32_cp_conv_any_to_w(path, len, &pathw_len);
if (!pathw) {
return 0;
}