Merge branch 'PHP-7.0' into PHP-7.1

weltling · weltling · commit a7b20894e5aa · 2017-01-13T16:54:10.000+01:00
* PHP-7.0:
  ensure the end path wouldn't contain double slashes
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c
@@ -102,6 +102,9 @@ static char *get_mmap_base_file(void)
 	}
 	GetTempPath(MAXPATHLEN, 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));
 
 	free(uname);

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,9 @@ static char *get_mmap_base_file(void)`
`102`	`102`	`}`
`103`	`103`	`GetTempPath(MAXPATHLEN, windir);`
`104`	`104`	`l = strlen(windir);`
	`105`	`+ if ('\\' == windir[l-1]) {`
	`106`	`+ l--;`
	`107`	`+ }`
`105`	`108`	`snprintf(windir + l, sizeof(windir) - l - 1, "\\%s@%s@%.32s", ACCEL_FILEMAP_BASE, uname, ZCG(system_id));`
`106`	`109`
`107`	`110`	`free(uname);`