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

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  Fix array clobbering by user error handler
This commit is contained in:
Dmitry Stogov 2021-12-15 12:21:36 +03:00
commit faa143ca1b
3 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Zend/tests/falsetoarray_003.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
Autovivification of false to array with data clobbering by error handler
--FILE--
<?php
set_error_handler(function($code, $msg) {
echo "Err: $msg\n";
$GLOBALS['a']=9;
});
$a=[];
($a[PHP_INT_MAX+1]);
?>
DONE
--EXPECTF--
Err: Implicit conversion from float %f to int loses precision
Err: Undefined array key %i
DONE

5
Zend/zend_vm_def.h
View file

@ -9710,7 +9710,10 @@ ZEND_VM_C_LABEL(fetch_dim_r_index_array):
if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) { if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) {
offset = Z_LVAL_P(dim); offset = Z_LVAL_P(dim);
} else { } else {
offset = zval_get_long_ex(dim, /* is_strict */ true); SAVE_OPLINE();
zend_fetch_dimension_address_read_R(container, dim, OP2_TYPE OPLINE_CC EXECUTE_DATA_CC);
FREE_OP1();
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} }
ht = Z_ARRVAL_P(container); ht = Z_ARRVAL_P(container);
ZEND_HASH_INDEX_FIND(ht, offset, value, ZEND_VM_C_LABEL(fetch_dim_r_index_undef)); ZEND_HASH_INDEX_FIND(ht, offset, value, ZEND_VM_C_LABEL(fetch_dim_r_index_undef));

25
Zend/zend_vm_execute.h
View file

@ -8313,7 +8313,10 @@ fetch_dim_r_index_array:
if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) { if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) {
offset = Z_LVAL_P(dim); offset = Z_LVAL_P(dim);
} else { } else {
offset = zval_get_long_ex(dim, /* is_strict */ true); SAVE_OPLINE();
zend_fetch_dimension_address_read_R(container, dim, (IS_TMP_VAR|IS_VAR|IS_CV) OPLINE_CC EXECUTE_DATA_CC);
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} }
ht = Z_ARRVAL_P(container); ht = Z_ARRVAL_P(container);
ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef); ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef);
@ -16149,7 +16152,10 @@ fetch_dim_r_index_array:
if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) { if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) {
offset = Z_LVAL_P(dim); offset = Z_LVAL_P(dim);
} else { } else {
offset = zval_get_long_ex(dim, /* is_strict */ true); SAVE_OPLINE();
zend_fetch_dimension_address_read_R(container, dim, IS_CONST OPLINE_CC EXECUTE_DATA_CC);
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} }
ht = Z_ARRVAL_P(container); ht = Z_ARRVAL_P(container);
ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef); ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef);
@ -16201,7 +16207,10 @@ fetch_dim_r_index_array:
if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) { if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) {
offset = Z_LVAL_P(dim); offset = Z_LVAL_P(dim);
} else { } else {
offset = zval_get_long_ex(dim, /* is_strict */ true); SAVE_OPLINE();
zend_fetch_dimension_address_read_R(container, dim, (IS_TMP_VAR|IS_VAR|IS_CV) OPLINE_CC EXECUTE_DATA_CC);
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} }
ht = Z_ARRVAL_P(container); ht = Z_ARRVAL_P(container);
ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef); ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef);
@ -43065,7 +43074,10 @@ fetch_dim_r_index_array:
if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) { if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) {
offset = Z_LVAL_P(dim); offset = Z_LVAL_P(dim);
} else { } else {
offset = zval_get_long_ex(dim, /* is_strict */ true); SAVE_OPLINE();
zend_fetch_dimension_address_read_R(container, dim, IS_CONST OPLINE_CC EXECUTE_DATA_CC);
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} }
ht = Z_ARRVAL_P(container); ht = Z_ARRVAL_P(container);
ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef); ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef);
@ -43117,7 +43129,10 @@ fetch_dim_r_index_array:
if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) { if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) {
offset = Z_LVAL_P(dim); offset = Z_LVAL_P(dim);
} else { } else {
offset = zval_get_long_ex(dim, /* is_strict */ true); SAVE_OPLINE();
zend_fetch_dimension_address_read_R(container, dim, (IS_TMP_VAR|IS_VAR|IS_CV) OPLINE_CC EXECUTE_DATA_CC);
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} }
ht = Z_ARRVAL_P(container); ht = Z_ARRVAL_P(container);
ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef); ZEND_HASH_INDEX_FIND(ht, offset, value, fetch_dim_r_index_undef);