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

Fixed bug #49037 (@list( $b ) = $a; causes a crash)

Browse source
This commit is contained in:
Dmitry Stogov 2009-07-28 13:01:40 +00:00
parent 5753d36230
commit f560d4ea84
3 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Zend/tests/bug49037.phpt Normal file
View file

@ -0,0 +1,14 @@
--TEST--
Bug #49037 (@list( $b ) = $a; causes a crash)
--FILE--
<?php
$a = array( "c" );
@list( $b ) = $a;
print_r( $a );
?>
--EXPECT--
Array
(
[0] => c
)

3
Zend/zend_vm_def.h
View file

@ -1491,6 +1491,9 @@ ZEND_VM_HANDLER(98, ZEND_FETCH_DIM_TMP_VAR, VAR|CV|CONST|TMP, CONST)
if (OP1_TYPE == IS_VAR && EX_T(opline->op1.u.var).var.ptr == NULL) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
if (OP1_TYPE == IS_VAR && EX_T(opline->op1.u.var).var.ptr_ptr) {
PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
}
container = GET_OP1_ZVAL_PTR(BP_VAR_R);
if (Z_TYPE_P(container) != IS_ARRAY) {
if (!RETURN_VALUE_UNUSED(&opline->result)) {

12
Zend/zend_vm_execute.h
View file

@ -2680,6 +2680,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O
if (IS_CONST == IS_VAR && EX_T(opline->op1.u.var).var.ptr == NULL) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
if (IS_CONST == IS_VAR && EX_T(opline->op1.u.var).var.ptr_ptr) {
PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
}
container = &opline->op1.u.constant;
if (Z_TYPE_P(container) != IS_ARRAY) {
if (!RETURN_VALUE_UNUSED(&opline->result)) {
@ -6117,6 +6120,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPC
if (IS_TMP_VAR == IS_VAR && EX_T(opline->op1.u.var).var.ptr == NULL) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
if (IS_TMP_VAR == IS_VAR && EX_T(opline->op1.u.var).var.ptr_ptr) {
PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
}
container = _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
if (Z_TYPE_P(container) != IS_ARRAY) {
if (!RETURN_VALUE_UNUSED(&opline->result)) {
@ -10579,6 +10585,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_VAR_CONST_HANDLER(ZEND_OPC
if (IS_VAR == IS_VAR && EX_T(opline->op1.u.var).var.ptr == NULL) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
if (IS_VAR == IS_VAR && EX_T(opline->op1.u.var).var.ptr_ptr) {
PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
}
container = _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
if (Z_TYPE_P(container) != IS_ARRAY) {
if (!RETURN_VALUE_UNUSED(&opline->result)) {
@ -24941,6 +24950,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCO
if (IS_CV == IS_VAR && EX_T(opline->op1.u.var).var.ptr == NULL) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
if (IS_CV == IS_VAR && EX_T(opline->op1.u.var).var.ptr_ptr) {
PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
}
container = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
if (Z_TYPE_P(container) != IS_ARRAY) {
if (!RETURN_VALUE_UNUSED(&opline->result)) {