diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.c | 8 |
2 files changed, 10 insertions, 1 deletions
@@ -39,6 +39,9 @@ PHP NEWS . Fixed bug #78982 (pdo_pgsql returns dead persistent connection). (SATŌ Kentarō) +- Shmop: + . Fixed bug #78538 (shmop memory leak). (cmb) + 18 Dec 2019, PHP 7.3.13 - Bcmath: diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 06ca965d64..cb2520e294 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -721,6 +721,7 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags) TSRM_API int shmdt(const void *shmaddr) {/*{{{*/ shm_pair *shm = shm_get(0, (void*)shmaddr); + int ret; if (!shm->segment) { return -1; @@ -730,7 +731,12 @@ TSRM_API int shmdt(const void *shmaddr) shm->descriptor->shm_lpid = getpid(); shm->descriptor->shm_nattch--; - return UnmapViewOfFile(shm->addr) ? 0 : -1; + ret = UnmapViewOfFile(shm->addr) ? 0 : -1; + if (!ret && shm->descriptor->shm_nattch <= 0) { + ret = UnmapViewOfFile(shm->descriptor) ? 0 : -1; + shm->descriptor = NULL; + } + return ret; }/*}}}*/ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) |