Skip to content

Commit 79d4fda

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix potential NULL pointer dereference Windows shm*() functions
2 parents 1e3915c + 8bf6266 commit 79d4fda

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PHP NEWS
55
- Core:
66
. Fixed bug GH-9823 (Don’t reset func in zend_closure_internal_handler).
77
(Florian Sowade)
8+
. Fixed potential NULL pointer dereference Windows shm*() functions. (cmb)
89

910
- FPM:
1011
. Fixed bug GH-9754 (SaltStack (using Python subprocess) hangs when running

TSRM/tsrm_win32.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
686686
{/*{{{*/
687687
shm_pair *shm = shm_get(key, NULL);
688688

689-
if (!shm->segment) {
689+
if (!shm || !shm->segment) {
690690
return (void*)-1;
691691
}
692692

@@ -703,7 +703,7 @@ TSRM_API int shmdt(const void *shmaddr)
703703
shm_pair *shm = shm_get(0, (void*)shmaddr);
704704
int ret;
705705

706-
if (!shm->segment) {
706+
if (!shm || !shm->segment) {
707707
return -1;
708708
}
709709

@@ -723,7 +723,7 @@ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf)
723723
{/*{{{*/
724724
shm_pair *shm = shm_get(key, NULL);
725725

726-
if (!shm->segment) {
726+
if (!shm || !shm->segment) {
727727
return -1;
728728
}
729729

0 commit comments

Comments
 (0)