archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2'

Browse source 
* PHP-8.2:
  Fix GH-9829: Bug in refactoring Windows shmat() function
This commit is contained in:
Christoph M. Becker 2022-11-02 14:05:54 +01:00
commit a27c41a98f
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TSRM/tsrm_win32.c
View file

@ -691,13 +691,6 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
} }
shm->addr = shm->descriptor + sizeof(shm->descriptor); shm->addr = shm->descriptor + sizeof(shm->descriptor);
if (NULL == shm->addr) {
int err = GetLastError();
SET_ERRNO_FROM_WIN32_CODE(err);
return (void*)-1;
}
shm->descriptor->shm_atime = time(NULL); shm->descriptor->shm_atime = time(NULL);
shm->descriptor->shm_lpid = getpid(); shm->descriptor->shm_lpid = getpid();
shm->descriptor->shm_nattch++; shm->descriptor->shm_nattch++;