diff options
| author | Pierre Joye <pajoye@php.net> | 2009-08-27 09:39:01 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2009-08-27 09:39:01 +0000 |
| commit | f8637584d90a3328ef0c12419c2bfb223edf0c86 (patch) | |
| tree | d66d93781280f234551d446fe1a0af98aa4c6695 | |
| parent | 552d8f483615d20a7be1ddeedbec312e8bb6c770 (diff) | |
| download | php-git-f8637584d90a3328ef0c12419c2bfb223edf0c86.tar.gz | |
- Fix for #48746, fix mounted volume and junctions when used from vista or later, they are actually prepended with \??\
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index bb1e329954..a2bcd78ffd 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -723,6 +723,11 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i rname_off += 4; rname_len -= 4; } + if(reparsetarget[rname_off] == L'\\' && reparsetarget[rname_off + 1] == L'?' && + reparsetarget[rname_off + 2] == L'?' && reparsetarget[rname_off + 3] == L'\\') { + rname_off += 4; + rname_len -= 4; + } } /* Convert wide string to narrow string */ |