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

fix: dangling opline in ZEND_INIT_ARRAY (#18578)

Browse source 
This causes problems if an allocation profiler decides to walk the
stack, or if the engine itself OOMs on this opcode, and it tries to
print file and line information.
This commit is contained in:
Levi Morrison 2025-05-19 09:45:28 -06:00 • committed by GitHub
parent 88d6e7c238
commit 35455b17be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Zend/zend_vm_def.h
View file

@ -6281,6 +6281,7 @@ ZEND_VM_HANDLER(71, ZEND_INIT_ARRAY, CONST|TMP|VAR|CV|UNUSED, CONST|TMPVAR|UNUSE
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (OP1_TYPE != IS_UNUSED) { if (OP1_TYPE != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;

20
Zend/zend_vm_execute.h generated
View file

@ -7424,6 +7424,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CONST_CONST_HA
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_CONST != IS_UNUSED) { if (IS_CONST != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -9765,6 +9766,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CONST_TMPVAR_H
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_CONST != IS_UNUSED) { if (IS_CONST != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -10695,6 +10697,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CONST_UNUSED_H
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_CONST != IS_UNUSED) { if (IS_CONST != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -12161,6 +12164,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CONST_CV_HANDL
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_CONST != IS_UNUSED) { if (IS_CONST != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -20189,6 +20193,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_TMP_CONST_HAND
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_TMP_VAR != IS_UNUSED) { if (IS_TMP_VAR != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -20633,6 +20638,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_TMP_TMPVAR_HAN
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_TMP_VAR != IS_UNUSED) { if (IS_TMP_VAR != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -21094,6 +21100,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_TMP_UNUSED_HAN
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_TMP_VAR != IS_UNUSED) { if (IS_TMP_VAR != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -21498,6 +21505,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_TMP_CV_HANDLER
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_TMP_VAR != IS_UNUSED) { if (IS_TMP_VAR != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -25327,6 +25335,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_VAR_CONST_HAND
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_VAR != IS_UNUSED) { if (IS_VAR != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -27777,6 +27786,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_VAR_TMPVAR_HAN
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_VAR != IS_UNUSED) { if (IS_VAR != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -29855,6 +29865,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_VAR_UNUSED_HAN
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_VAR != IS_UNUSED) { if (IS_VAR != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -32165,6 +32176,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_VAR_CV_HANDLER
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_VAR != IS_UNUSED) { if (IS_VAR != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -34399,6 +34411,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_CONST_H
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_UNUSED != IS_UNUSED) { if (IS_UNUSED != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -36281,6 +36294,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_TMPVAR_
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_UNUSED != IS_UNUSED) { if (IS_UNUSED != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -36918,6 +36932,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_UNUSED_
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_UNUSED != IS_UNUSED) { if (IS_UNUSED != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -38776,6 +38791,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_CV_HAND
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_UNUSED != IS_UNUSED) { if (IS_UNUSED != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -43871,6 +43887,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CV_CONST_HANDL
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_CV != IS_UNUSED) { if (IS_CV != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -47511,6 +47528,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CV_TMPVAR_HAND
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_CV != IS_UNUSED) { if (IS_CV != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -49480,6 +49498,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CV_UNUSED_HAND
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_CV != IS_UNUSED) { if (IS_CV != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
@ -52998,6 +53017,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CV_CV_HANDLER(
uint32_t size; uint32_t size;
USE_OPLINE USE_OPLINE
SAVE_OPLINE();
array = EX_VAR(opline->result.var); array = EX_VAR(opline->result.var);
if (IS_CV != IS_UNUSED) { if (IS_CV != IS_UNUSED) {
size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;