mirror of
https://github.com/php/php-src.git
synced 2025-08-16 14:08:47 +02:00
- MFH: Fixed bug #47572 (zval_update_constant_ex: Segmentation fault)
This commit is contained in:
parent
456d5e9381
commit
c43b935b65
2 changed files with 22 additions and 3 deletions
17
Zend/tests/bug47572.phpt
Normal file
17
Zend/tests/bug47572.phpt
Normal file
|
@ -0,0 +1,17 @@
|
|||
--TEST--
|
||||
Bug #47572 (zval_update_constant_ex: Segmentation fault)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class Foo {
|
||||
public static $bar = array(
|
||||
FOO => "bar"
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
$foo = new Foo();
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Notice: Use of undefined constant FOO - assumed 'FOO' in %s on line %d
|
|
@ -575,7 +575,7 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco
|
|||
} else if (Z_TYPE_P(p) == IS_CONSTANT_ARRAY) {
|
||||
zval **element, *new_val;
|
||||
char *str_index;
|
||||
uint str_index_len;
|
||||
uint str_index_len = 0;
|
||||
ulong num_index;
|
||||
int ret;
|
||||
|
||||
|
@ -613,9 +613,11 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco
|
|||
str_index = colon;
|
||||
} else {
|
||||
if (str_index[str_index_len - 2] & IS_CONSTANT_UNQUALIFIED) {
|
||||
actual = (char *)zend_memrchr(str_index, '\\', str_index_len - 3) + 1;
|
||||
if ((actual = (char *)zend_memrchr(str_index, '\\', str_index_len - 3))) {
|
||||
actual++;
|
||||
str_index_len -= (actual - str_index);
|
||||
str_index = actual;
|
||||
str_index = save;
|
||||
}
|
||||
}
|
||||
if (str_index[0] == '\\') {
|
||||
++str_index;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue