diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/standard/tests/file/bug78296.phpt | 16 | ||||
| -rw-r--r-- | win32/ioutil.c | 12 | ||||
| -rw-r--r-- | win32/ioutil.h | 10 |
4 files changed, 37 insertions, 2 deletions
@@ -8,6 +8,7 @@ PHP NEWS exception). (Nikita) . Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value). (Antony Dovgal, Dmitry) + . Fixed bug #78296 (is_file fails to detect file). (cmb) - GD: . Fixed bug #78849 (GD build broken with -D SIGNED_COMPARE_SLOW). (cmb) diff --git a/ext/standard/tests/file/bug78296.phpt b/ext/standard/tests/file/bug78296.phpt new file mode 100644 index 0000000000..e7388d51b7 --- /dev/null +++ b/ext/standard/tests/file/bug78296.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #78296 (is_file fails to detect file) +--FILE-- +<?php +$dir = str_pad(__DIR__ . '/bug78296', 250, '_'); +var_dump(mkdir($dir)); +var_dump(is_dir($dir)); +?> +--EXPECT-- +bool(true) +bool(true) +--CLEAN-- +<?php +$dir = str_pad(__DIR__ . '/bug78296', 250, '_'); +rmdir($dir); +?> diff --git a/win32/ioutil.c b/win32/ioutil.c index f7db410dd2..ce4fc9b65c 100644 --- a/win32/ioutil.c +++ b/win32/ioutil.c @@ -322,13 +322,23 @@ PW32IO int php_win32_ioutil_mkdir_w(const wchar_t *path, mode_t mode) if (!PHP_WIN32_IOUTIL_IS_LONG_PATHW(tmp, path_len)) { wchar_t *_tmp = (wchar_t *) malloc((path_len + PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW + 1) * sizeof(wchar_t)); + wchar_t *src, *dst; if (!_tmp) { SET_ERRNO_FROM_WIN32_CODE(ERROR_NOT_ENOUGH_MEMORY); free(tmp); return -1; } memmove(_tmp, PHP_WIN32_IOUTIL_LONG_PATH_PREFIXW, PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW * sizeof(wchar_t)); - memmove(_tmp+PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW, tmp, path_len * sizeof(wchar_t)); + src = tmp; + dst = _tmp + PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW; + while (src < tmp + path_len) { + if (*src == PHP_WIN32_IOUTIL_FW_SLASHW) { + *dst++ = PHP_WIN32_IOUTIL_DEFAULT_SLASHW; + src++; + } else { + *dst++ = *src++; + } + } path_len += PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW; _tmp[path_len] = L'\0'; free(tmp); diff --git a/win32/ioutil.h b/win32/ioutil.h index 34104a3f45..93dea15967 100644 --- a/win32/ioutil.h +++ b/win32/ioutil.h @@ -220,8 +220,16 @@ __forceinline static wchar_t *php_win32_ioutil_conv_any_to_w(const char* in, siz memmove(ret, mb, mb_len * sizeof(wchar_t)); ret[mb_len] = L'\0'; } else { + wchar_t *src = mb, *dst = ret + PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW; memmove(ret, PHP_WIN32_IOUTIL_LONG_PATH_PREFIXW, PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW * sizeof(wchar_t)); - memmove(ret+PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW, mb, mb_len * sizeof(wchar_t)); + while (src < mb + mb_len) { + if (*src == PHP_WIN32_IOUTIL_FW_SLASHW) { + *dst++ = PHP_WIN32_IOUTIL_DEFAULT_SLASHW; + src++; + } else { + *dst++ = *src++; + } + } ret[mb_len + PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW] = L'\0'; mb_len += PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW; |