summaryrefslogtreecommitdiff
path: root/TSRM/tsrm_virtual_cwd.c
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2009-08-27 09:39:01 +0000
committerPierre Joye <pajoye@php.net>2009-08-27 09:39:01 +0000
commit17a419157508b8c8221e8381408e849831606f1f (patch)
tree32f0ad11b274fee6a6708dabd3a4559fcad5cc4a /TSRM/tsrm_virtual_cwd.c
parentb73fe4a9b6913101c852eb08daf2a9672f158c13 (diff)
downloadphp-git-17a419157508b8c8221e8381408e849831606f1f.tar.gz
- Fix for #48746, fix mounted volume and junctions when used from vista or later, they are actually prepended with \??\
Diffstat (limited to 'TSRM/tsrm_virtual_cwd.c')
-rw-r--r--TSRM/tsrm_virtual_cwd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 00e878707f..97d9ebd320 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 */