Commit 4c95cb3

committed

Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: Fix GH-14741: Segmentation fault in Zend/zend_types.h

2 parents 192c102 + eb8c3cb commit 4c95cb3Copy full SHA for 4c95cb3

File tree

+19

-0

lines changed

+19

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ PHP NEWS`
`9`	`9`	`. Fixed bug GH-14590 (Memory leak in FPM test gh13563-conf-bool-env.phpt.`
`10`	`10`	`(nielsdos)`
`11`	`11`	`. Fixed OSS-Fuzz #69765. (nielsdos)`
	`12`	`+ . Fixed bug GH-14741 (Segmentation fault in Zend/zend_types.h). (nielsdos)`
`12`	`13`
`13`	`14`	`- Dom:`
`14`	`15`	`. Fixed bug GH-14702 (DOMDocument::xinclude() crash). (nielsdos)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -667,6 +667,7 @@ ZEND_API void zend_register_interfaces(void)`
`667`	`667`
`668`	`668`	`memcpy(&zend_internal_iterator_handlers, zend_get_std_object_handlers(),`
`669`	`669`	`sizeof(zend_object_handlers));`
	`670`	`+ zend_internal_iterator_handlers.clone_obj = NULL;`
`670`	`671`	`zend_internal_iterator_handlers.free_obj = zend_internal_iterator_free;`
`671`	`672`	`}`
`672`	`673`	`/* }}} */`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,17 @@`
	`1`	`+--TEST--`
	`2`	`+GH-14741 (Segmentation fault in Zend/zend_types.h)`
	`3`	`+--EXTENSIONS--`
	`4`	`+zend_test`
	`5`	`+--FILE--`
	`6`	`+<?php`
	`7`	`+$subject = new \ZendTest\Iterators\TraversableTest();`
	`8`	`+$it = $subject->getIterator();`
	`9`	`+try {`
	`10`	`+ clone $it;`
	`11`	`+} catch (Error $e) {`
	`12`	`+ echo $e->getMessage(), "\n";`
	`13`	`+}`
	`14`	`+?>`
	`15`	`+--EXPECT--`
	`16`	`+Trying to clone an uncloneable object of class InternalIterator`
	`17`	`+TraversableTest::drop`

Comments

(0)