Commit 6704c60

committed

Fix GH-14596: phpdbg with asan and ZC_RC_DEBUG set crashes.

1 parent 49aaa7c commit 6704c60Copy full SHA for 6704c60

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@ PHP NEWS`
`2`	`2`	`\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|`
`3`	`3`	`?? ??? ????, PHP 8.2.22`
`4`	`4`
	`5`	`+- PHPDBG:`
	`6`	`+ . Fixed bug GH-14596 (crashes with ASAN and ZEND_RC_DEBUG=1).`
	`7`	`+ (David Carlier)`
	`8`	`+`
`5`	`9`
`6`	`10`	`04 Jul 2024, PHP 8.2.21`
`7`	`11`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -229,13 +229,13 @@ static PHP_RINIT_FUNCTION(phpdbg) /* {{{ */`
`229`	`229`
`230`	`230`	`if (zend_vm_kind() != ZEND_VM_KIND_HYBRID) {`
`231`	`231`	`/* phpdbg cannot work JIT-ed code */`
`232`		`- zend_string *key = zend_string_init(ZEND_STRL("opcache.jit"), 1);`
`233`		`- zend_string *value = zend_string_init(ZEND_STRL("off"), 1);`
	`232`	`+ zend_string *key = zend_string_init(ZEND_STRL("opcache.jit"), false);`
	`233`	`+ zend_string *value = zend_string_init(ZEND_STRL("off"), false);`
`234`	`234`
`235`		`- zend_alter_ini_entry(key, value, ZEND_INI_SYSTEM, ZEND_INI_STAGE_STARTUP);`
	`235`	`+ zend_alter_ini_entry_ex(key, value, ZEND_INI_SYSTEM, ZEND_INI_STAGE_STARTUP, false);`
`236`	`236`
`237`		`- zend_string_release(key);`
`238`		`- zend_string_release(value);`
	`237`	`+ zend_string_release_ex(key, false);`
	`238`	`+ zend_string_release_ex(value, false);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`return SUCCESS;`

Comments

(0)