Merge branch 'PHP-8.5'

ndossche · ndossche · commit a16ace8ee784 · 2026-03-17T08:47:51.000+01:00
* PHP-8.5: Fix GH-21454: Missing write lock validation in SplHeap
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
@@ -938,7 +938,7 @@ static void spl_heap_it_move_forward(zend_object_iterator *iter) /* {{{ */
 {
 	spl_heap_object *object = Z_SPLHEAP_P(&iter->data);
 
-	if (UNEXPECTED(spl_heap_consistency_validations(object, false) != SUCCESS)) {
+	if (UNEXPECTED(spl_heap_consistency_validations(object, true) != SUCCESS)) {
 		return;
 	}
 
@@ -965,6 +965,10 @@ PHP_METHOD(SplHeap, next)
 
 	ZEND_PARSE_PARAMETERS_NONE();
 
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
+		RETURN_THROWS();
+	}
+
 	spl_ptr_heap_delete_top(intern->heap, NULL, ZEND_THIS);
 }
 /* }}} */
diff --git a/ext/spl/tests/heap_next_write_lock.phpt b/ext/spl/tests/heap_next_write_lock.phpt
@@ -0,0 +1,34 @@
+--TEST--
+SplHeap::next() write lock
+--CREDITS--
+cnitlrt
+--FILE--
+<?php
+
+class EvilPQ extends SplPriorityQueue {
+    private bool $did = false;
+
+    public function compare(mixed $p1, mixed $p2): int {
+        if (!$this->did) {
+            $this->did = true;
+            // Re-entrant write during internal heap insertion comparison.
+            if (!$this->isEmpty()) {
+                $this->next(); // no write-lock validation
+            }
+        }
+        return parent::compare($p1, $p2);
+    }
+}
+
+$q = new EvilPQ();
+try {
+    for ($i = 0; $i < 200; $i++) {
+        $q->insert("d$i", 100 - $i);
+    }
+} catch (RuntimeException $e) {
+    echo $e::class, ": ", $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+RuntimeException: Heap cannot be changed when it is already being modified.

Original file line number	Diff line number	Diff line change
`@@ -938,7 +938,7 @@ static void spl_heap_it_move_forward(zend_object_iterator iter) / {{{ */`
`938`	`938`	`{`
`939`	`939`	`spl_heap_object *object = Z_SPLHEAP_P(&iter->data);`
`940`	`940`
`941`		`- if (UNEXPECTED(spl_heap_consistency_validations(object, false) != SUCCESS)) {`
	`941`	`+ if (UNEXPECTED(spl_heap_consistency_validations(object, true) != SUCCESS)) {`
`942`	`942`	`return;`
`943`	`943`	`}`
`944`	`944`
`@@ -965,6 +965,10 @@ PHP_METHOD(SplHeap, next)`
`965`	`965`
`966`	`966`	`ZEND_PARSE_PARAMETERS_NONE();`
`967`	`967`
	`968`	`+ if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {`
	`969`	`+ RETURN_THROWS();`
	`970`	`+ }`
	`971`	`+`
`968`	`972`	`spl_ptr_heap_delete_top(intern->heap, NULL, ZEND_THIS);`
`969`	`973`	`}`
`970`	`974`	`/* }}} */`