Merge branch 'PHP-8.2'

cmb69 · cmb69 · commit dbf211de40c1 · 2022-11-18T14:38:03.000+01:00
* PHP-8.2:
  Avoid undefined behavior in Windows ftok(3) emulation
diff --git a/win32/ftok.c b/win32/ftok.c
@@ -51,7 +51,7 @@ ftok(const char *pathname, int proj_id)
 		return (key_t)-1;
 	}
 
-	ret = (key_t) ((proj_id & 0xff) << 24 | (st.st_dev & 0xff) << 16 | ((bhfi.nFileIndexLow | (__int64)bhfi.nFileIndexHigh << 32) & 0xffff));
+	ret = (key_t) ((proj_id & 0xff) << 24 | (st.st_dev & 0xff) << 16 | (bhfi.nFileIndexLow & 0xffff));
 
 	CloseHandle(fh);
 	PHP_WIN32_IOUTIL_CLEANUP_W()

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ ftok(const char *pathname, int proj_id)`
`51`	`51`	`return (key_t)-1;`
`52`	`52`	`}`
`53`	`53`
`54`		`- ret = (key_t) ((proj_id & 0xff) << 24 \| (st.st_dev & 0xff) << 16 \| ((bhfi.nFileIndexLow \| (__int64)bhfi.nFileIndexHigh << 32) & 0xffff));`
	`54`	`+ ret = (key_t) ((proj_id & 0xff) << 24 \| (st.st_dev & 0xff) << 16 \| (bhfi.nFileIndexLow & 0xffff));`
`55`	`55`
`56`	`56`	`CloseHandle(fh);`
`57`	`57`	`PHP_WIN32_IOUTIL_CLEANUP_W()`