clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Avoid undefined behavior in Windows ftok(3) emulation
This commit is contained in:
Christoph M. Becker 2022-11-18 14:37:24 +01:00
commit 5e307d0cab
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -9,6 +9,7 @@ PHP NEWS
README.REDIST.BINS file). (Akama Hitoshi)
. Fixed bug GH-9890 (OpenSSL legacy providers not available on Windows). (cmb)
. Fixed bug GH-9650 (Can't initialize heap: [0x000001e7]). (Michael Voříšek)
. Fixed potentially undefined behavior in Windows ftok(3) emulation. (cmb)
- Pcntl:
. Fixed bug GH-9298 (Signal handler called after rshutdown leads to crash).

2
win32/ftok.c
View File

@ -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()