diff --git a/NEWS b/NEWS index 1bae876ac09..7c262a6d898 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ PHP NEWS - Core: . Fixed bug GH-9823 (Don’t reset func in zend_closure_internal_handler). (Florian Sowade) + . Fixed potential NULL pointer dereference Windows shm*() functions. (cmb) - FPM: . Fixed bug GH-9754 (SaltStack (using Python subprocess) hangs when running diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 22e65173992..f7ecea012b5 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -686,7 +686,7 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags) {/*{{{*/ shm_pair *shm = shm_get(key, NULL); - if (!shm->segment) { + if (!shm || !shm->segment) { return (void*)-1; } @@ -703,7 +703,7 @@ TSRM_API int shmdt(const void *shmaddr) shm_pair *shm = shm_get(0, (void*)shmaddr); int ret; - if (!shm->segment) { + if (!shm || !shm->segment) { return -1; } @@ -723,7 +723,7 @@ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {/*{{{*/ shm_pair *shm = shm_get(key, NULL); - if (!shm->segment) { + if (!shm || !shm->segment) { return -1; }