diff options
| author | Pierre Joye <pajoye@php.net> | 2010-08-26 14:23:17 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-08-26 14:23:17 +0000 |
| commit | a5e51efff87d828dde6634559a8fbc2f89e086ed (patch) | |
| tree | 38181dca29dca1d6491df2e81a8db797068db2fa | |
| parent | 6338f99d522992bdea264fd774d773e09b4ce585 (diff) | |
| download | php-git-a5e51efff87d828dde6634559a8fbc2f89e086ed.tar.gz | |
- Symlink resolution fails when target is a DFS path
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -9,7 +9,8 @@ - Added new character sets to mysqlnd, which are available in MySQL 5.5 (Andrey) -- Fixed MOPS-2010-24, fix string validation. (CVE-2010-2950) (Pierre) +- Fixed symbolic resolution support when the target is a DFS share. (Pierre) +- Fixed MOPS-2010-24, fix string validation. (CVE-2010-2950). (Pierre) - Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED. (Kalle) - Changed the $context parameter on copy() to actually have an effect. (Kalle) diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index d51e01aa3e..947b22c8f4 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -811,8 +811,10 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i \\?\Volume{62d1c3f8-83b9-11de-b108-806e6f6e6963}\foo */ if (strncmp(substitutename, "\\??\\Volume{",11) == 0 - || strncmp(substitutename, "\\\\?\\Volume{",11) == 0) { - isVolume = TRUE; + || strncmp(substitutename, "\\\\?\\Volume{",11) == 0 + || strncmp(substitutename, "\\??\\UNC\\", 8) == 0 + ) { + isVolume = TRUE; substitutename_off = 0; } else /* do not use the \??\ and \\?\ prefix*/ |