1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.2'

* 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

View File

@@ -691,13 +691,6 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
}
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_lpid = getpid();
shm->descriptor->shm_nattch++;