Merge branch 'PHP-7.1'

* PHP-7.1:
  ensure the end path wouldn't contain double slashes
This commit is contained in:
Anatol Belski 2017-01-13 16:55:49 +01:00
commit 9db2dab858

View file

@ -102,6 +102,9 @@ static char *get_mmap_base_file(void)
} }
GetTempPath(MAXPATHLEN, windir); GetTempPath(MAXPATHLEN, windir);
l = strlen(windir); l = strlen(windir);
if ('\\' == windir[l-1]) {
l--;
}
snprintf(windir + l, sizeof(windir) - l - 1, "\\%s@%s@%.32s", ACCEL_FILEMAP_BASE, uname, ZCG(system_id)); snprintf(windir + l, sizeof(windir) - l - 1, "\\%s@%s@%.32s", ACCEL_FILEMAP_BASE, uname, ZCG(system_id));
free(uname); free(uname);