archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

An demo(for review) to show how to fix the problem we meet

Browse source
This commit is contained in:
Xinchen Hui 2014-03-10 11:29:28 +08:00
parent a38694be52
commit 4aeae15706
4 changed files with 504 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

79
Zend/zend_execute.c
View file

@ -214,8 +214,9 @@ static zend_never_inline zval *_get_zval_cv_lookup(zval *ptr, zend_uint var, int
if (EG(active_symbol_table)) {
ret = zend_hash_find(EG(active_symbol_table), cv);
if (ret) {
ZVAL_INDIRECT(ptr, ret);
return ret;
ZEND_ASSERT(Z_TYPE_P(ret) == IS_INDIRECT);
ZVAL_INDIRECT(ptr, Z_INDIRECT_P(ret));
return Z_INDIRECT_P(ptr);
}
}
@ -231,12 +232,14 @@ static zend_never_inline zval *_get_zval_cv_lookup(zval *ptr, zend_uint var, int
/* break missing intentionally */
case BP_VAR_W:
if (EG(active_symbol_table)) {
ret = zend_hash_update(EG(active_symbol_table), cv, ret);
ZVAL_INDIRECT(ptr, ret);
zval zv;
ZVAL_COPY_VALUE(ptr, &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, ptr);
zend_hash_update(EG(active_symbol_table), cv, &zv);
} else {
ZVAL_NULL(ptr);
ret = ptr;
}
ret = ptr;
break;
}
return ret;
@ -250,8 +253,9 @@ static zend_never_inline zval *_get_zval_cv_lookup_BP_VAR_R(zval *ptr, zend_uint
if (EG(active_symbol_table)) {
ret = zend_hash_find(EG(active_symbol_table), cv);
if (ret) {
ZVAL_INDIRECT(ptr, ret);
return ret;
ZEND_ASSERT(Z_TYPE_P(ret) == IS_INDIRECT);
ZVAL_INDIRECT(ptr, Z_INDIRECT_P(ret));
return Z_INDIRECT_P(ptr);
}
}
@ -267,8 +271,9 @@ static zend_never_inline zval *_get_zval_cv_lookup_BP_VAR_UNSET(zval *ptr, zend_
if (EG(active_symbol_table)) {
ret = zend_hash_find(EG(active_symbol_table), cv);
if (ret) {
ZVAL_INDIRECT(ptr, ret);
return ret;
ZEND_ASSERT(Z_TYPE_P(ret) == IS_INDIRECT);
ZVAL_INDIRECT(ptr, Z_INDIRECT_P(ret));
return Z_INDIRECT_P(ptr);
}
}
@ -284,8 +289,9 @@ static zend_never_inline zval *_get_zval_cv_lookup_BP_VAR_IS(zval *ptr, zend_uin
if (EG(active_symbol_table)) {
ret = zend_hash_find(EG(active_symbol_table), cv);
if (ret) {
ZVAL_INDIRECT(ptr, ret);
return ret;
ZEND_ASSERT(Z_TYPE_P(ret) == IS_INDIRECT);
ZVAL_INDIRECT(ptr, Z_INDIRECT_P(ret));
return Z_INDIRECT_P(ptr);
}
}
@ -300,13 +306,17 @@ static zend_never_inline zval *_get_zval_cv_lookup_BP_VAR_RW(zval *ptr, zend_uin
if (EG(active_symbol_table)) {
ret = zend_hash_find(EG(active_symbol_table), cv);
if (ret) {
ZVAL_INDIRECT(ptr, ret);
return ret;
}
ret = zend_hash_update(EG(active_symbol_table), cv, &EG(uninitialized_zval));
ZVAL_INDIRECT(ptr, ret);
ZEND_ASSERT(Z_TYPE_P(ret) == IS_INDIRECT);
ZVAL_INDIRECT(ptr, Z_INDIRECT_P(ret));
return Z_INDIRECT_P(ptr);
} else {
zval zv;
ZVAL_COPY_VALUE(ptr, &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, ptr);
zend_hash_update(EG(active_symbol_table), cv, &zv);
zend_error(E_NOTICE, "Undefined variable: %s", cv->val);
return ret;
return ptr;
}
} else {
ZVAL_NULL(ptr);
zend_error(E_NOTICE, "Undefined variable: %s", cv->val);
@ -322,12 +332,16 @@ static zend_never_inline zval *_get_zval_cv_lookup_BP_VAR_W(zval *ptr, zend_uint
if (EG(active_symbol_table)) {
ret = zend_hash_find(EG(active_symbol_table), cv);
if (ret) {
ZVAL_INDIRECT(ptr, ret);
return ret;
ZEND_ASSERT(Z_TYPE_P(ret) == IS_INDIRECT);
ZVAL_INDIRECT(ptr, Z_INDIRECT_P(ret));
return Z_INDIRECT_P(ptr);
} else {
zval zv;
ZVAL_COPY_VALUE(ptr, &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, ptr);
zend_hash_update(EG(active_symbol_table), cv, &zv);
return ptr;
}
ret = zend_hash_update(EG(active_symbol_table), cv, &EG(uninitialized_zval));
ZVAL_INDIRECT(ptr, ret);
return ret;
} else {
ZVAL_NULL(ptr);
return ptr;
@ -1525,20 +1539,20 @@ static inline zend_brk_cont_element* zend_brk_cont(int nest_levels, int array_of
zend_hash_apply(EG(active_symbol_table), (apply_func_t) zend_check_symbol TSRMLS_CC); \
}
static int zend_check_symbol(zval **pz TSRMLS_DC)
static int zend_check_symbol(zval *zv TSRMLS_DC)
{
if (Z_TYPE_PP(pz) > 9) {
fprintf(stderr, "Warning! %x has invalid type!\n", *pz);
if (Z_TYPE_P(zv) > 17) {
fprintf(stderr, "Warning! %x has invalid type!\n", *zv);
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
} else if (Z_TYPE_PP(pz) == IS_ARRAY) {
zend_hash_apply(Z_ARRVAL_PP(pz), (apply_func_t) zend_check_symbol TSRMLS_CC);
} else if (Z_TYPE_PP(pz) == IS_OBJECT) {
} else if (Z_TYPE_P(zv) == IS_ARRAY) {
zend_hash_apply(Z_ARRVAL_P(zv), (apply_func_t) zend_check_symbol TSRMLS_CC);
} else if (Z_TYPE_P(zv) == IS_OBJECT) {
/* OBJ-TBI - doesn't support new object model! */
zend_hash_apply(Z_OBJPROP_PP(pz), (apply_func_t) zend_check_symbol TSRMLS_CC);
zend_hash_apply(Z_OBJPROP_P(zv), (apply_func_t) zend_check_symbol TSRMLS_CC);
}
return 0;
@ -1728,11 +1742,10 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array
if (!EG(active_symbol_table)) {
ZVAL_COPY(EX_VAR_NUM(op_array->this_var), &EG(This));
} else {
zval zv;
ZVAL_COPY(EX_VAR_NUM(op_array->this_var), &EG(This));
zval *zv = zend_hash_str_add(EG(active_symbol_table), "this", sizeof("this")-1, EX_VAR(op_array->this_var));
if (zv) {
ZVAL_INDIRECT(EX_VAR_NUM(op_array->this_var), zv);
}
ZVAL_INDIRECT(&zv, EX_VAR_NUM(op_array->this_var));
zend_hash_str_add(EG(active_symbol_table), "this", sizeof("this")-1, &zv);
}
}

7
Zend/zend_execute_API.c
View file

@ -1728,10 +1728,9 @@ ZEND_API void zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */
}
for (i = 0; i < ex->op_array->last_var; i++) {
if (Z_TYPE_P(EX_VAR_NUM_2(ex, i)) != IS_UNDEF) {
zval *zv = zend_hash_update(EG(active_symbol_table),
ex->op_array->vars[i],
EX_VAR_NUM_2(ex, i));
ZVAL_INDIRECT(EX_VAR_NUM_2(ex, i), zv);
zval zv;
ZVAL_INDIRECT(&zv, EX_VAR_NUM_2(ex, i));
zend_hash_update(EG(active_symbol_table), ex->op_array->vars[i], &zv);
}
}
}

33
Zend/zend_vm_def.h
View file

@ -1069,12 +1069,27 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMP|VAR|CV, UNUSED|CONST|
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (OP1_TYPE != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (OP1_TYPE != IS_TMP_VAR) {
@ -1085,7 +1100,9 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMP|VAR|CV, UNUSED|CONST|
FREE_OP1();
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (OP1_TYPE == IS_VAR && !OP1_FREE) {
@ -1093,18 +1110,11 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMP|VAR|CV, UNUSED|CONST|
}
break;
}
}
if (OP1_TYPE != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -4620,6 +4630,9 @@ ZEND_VM_HANDLER(114, ZEND_ISSET_ISEMPTY_VAR, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (OP1_TYPE != IS_CONST && varname == &tmp) {

396
Zend/zend_vm_execute.h
View file

@ -3622,12 +3622,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_CONST(int type
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_CONST != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_CONST != IS_TMP_VAR) {
@ -3638,7 +3653,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_CONST(int type
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_CONST == IS_VAR && !0) {
@ -3646,18 +3663,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_CONST(int type
}
break;
}
}
if (IS_CONST != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -4213,6 +4223,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_CONST != IS_CONST && varname == &tmp) {
@ -5404,12 +5417,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_VAR(int type,
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_CONST != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_CONST != IS_TMP_VAR) {
@ -5420,7 +5448,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_VAR(int type,
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_CONST == IS_VAR && !0) {
@ -5428,18 +5458,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_VAR(int type,
}
break;
}
}
if (IS_CONST != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -5881,6 +5904,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_VAR_HANDLER(ZEND_OPC
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_CONST != IS_CONST && varname == &tmp) {
@ -6113,12 +6139,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_UNUSED(int typ
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_CONST != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_CONST != IS_TMP_VAR) {
@ -6129,7 +6170,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_UNUSED(int typ
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_CONST == IS_VAR && !0) {
@ -6137,18 +6180,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_UNUSED(int typ
}
break;
}
}
if (IS_CONST != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -6558,6 +6594,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_UNUSED_HANDLER(ZEND_
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_CONST != IS_CONST && varname == &tmp) {
@ -8771,12 +8810,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_CONST(int type,
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_TMP_VAR != IS_TMP_VAR) {
@ -8787,7 +8841,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_CONST(int type,
zval_dtor(free_op1.var);
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_TMP_VAR == IS_VAR && !1) {
@ -8795,18 +8851,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_CONST(int type,
}
break;
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -9270,6 +9319,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPC
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
@ -10438,12 +10490,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_VAR(int type, ZE
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_TMP_VAR != IS_TMP_VAR) {
@ -10454,7 +10521,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_VAR(int type, ZE
zval_dtor(free_op1.var);
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_TMP_VAR == IS_VAR && !1) {
@ -10462,18 +10531,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_VAR(int type, ZE
}
break;
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -10925,6 +10987,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCOD
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
@ -11157,12 +11222,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_UNUSED(int type,
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_TMP_VAR != IS_TMP_VAR) {
@ -11173,7 +11253,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_UNUSED(int type,
zval_dtor(free_op1.var);
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_TMP_VAR == IS_VAR && !1) {
@ -11181,18 +11263,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_UNUSED(int type,
}
break;
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -11491,6 +11566,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_UNUSED_HANDLER(ZEND_OP
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
@ -14494,12 +14572,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_CONST(int type,
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_VAR != IS_TMP_VAR) {
@ -14510,7 +14603,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_CONST(int type,
zval_ptr_dtor_nogc(free_op1.var);
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_VAR == IS_VAR && !(free_op1.var != NULL)) {
@ -14518,18 +14613,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_CONST(int type,
}
break;
}
}
if (IS_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -15862,6 +15950,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_CONST_HANDLER(ZEND_OPC
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_VAR != IS_CONST && varname == &tmp) {
@ -19029,12 +19120,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_VAR(int type, ZE
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_VAR != IS_TMP_VAR) {
@ -19045,7 +19151,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_VAR(int type, ZE
zval_ptr_dtor_nogc(free_op1.var);
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_VAR == IS_VAR && !(free_op1.var != NULL)) {
@ -19053,18 +19161,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_VAR(int type, ZE
}
break;
}
}
if (IS_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -20361,6 +20462,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_VAR_HANDLER(ZEND_OPCOD
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_VAR != IS_CONST && varname == &tmp) {
@ -21000,12 +21104,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_UNUSED(int type,
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_VAR != IS_TMP_VAR) {
@ -21016,7 +21135,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_UNUSED(int type,
zval_ptr_dtor_nogc(free_op1.var);
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_VAR == IS_VAR && !(free_op1.var != NULL)) {
@ -21024,18 +21145,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_UNUSED(int type,
}
break;
}
}
if (IS_VAR != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -21623,6 +21737,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_UNUSED_HANDLER(ZEND_OP
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_VAR != IS_CONST && varname == &tmp) {
@ -31728,12 +31845,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_CONST(int type, Z
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_CV != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_CV != IS_TMP_VAR) {
@ -31744,7 +31876,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_CONST(int type, Z
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_CV == IS_VAR && !0) {
@ -31752,18 +31886,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_CONST(int type, Z
}
break;
}
}
if (IS_CV != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -32883,6 +33010,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCO
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_CV != IS_CONST && varname == &tmp) {
@ -35920,12 +36050,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_VAR(int type, ZEN
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_CV != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_CV != IS_TMP_VAR) {
@ -35936,7 +36081,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_VAR(int type, ZEN
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_CV == IS_VAR && !0) {
@ -35944,18 +36091,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_VAR(int type, ZEN
}
break;
}
}
if (IS_CV != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -37131,6 +37271,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_CV != IS_CONST && varname == &tmp) {
@ -37765,12 +37908,27 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_UNUSED(int type,
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
/* break missing intentionally */
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
case BP_VAR_W: {
zval zv;
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &EG(uninitialized_zval));
ZVAL_INDIRECT(&zv, EX_VAR(opline->result.var));
zend_hash_update(target_symbol_table, Z_STR_P(varname), &zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
}
if (IS_CV != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (retval && UNEXPECTED(Z_TYPE_P(retval) == IS_INDIRECT)) {
retval = Z_INDIRECT_P(retval);
}
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (IS_CV != IS_TMP_VAR) {
@ -37781,7 +37939,9 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_UNUSED(int type,
break;
case ZEND_FETCH_STATIC:
if (retval) {
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
}
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (IS_CV == IS_VAR && !0) {
@ -37789,18 +37949,11 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_UNUSED(int type,
}
break;
}
}
if (IS_CV != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
if (EXPECTED(retval != NULL)) {
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
}
if (EXPECTED(retval != NULL)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
switch (type) {
case BP_VAR_R:
@ -38275,6 +38428,9 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_UNUSED_HANDLER(ZEND_OPC
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
isset = 0;
}
if (UNEXPECTED(Z_TYPE_P(value) == IS_INDIRECT)) {
value = Z_INDIRECT_P(value);
}
}
if (IS_CV != IS_CONST && varname == &tmp) {