Skip to content

Commit 96c84b7

Browse files
nikicnikic
committed
Fix leak on static method call on non-existent class
1 parent daf1fc6 commit 96c84b7

File tree

3 files changed

+28
-0
lines changed

3 files changed

+28
-0
lines changed

‎Zend/tests/static_method_non_existing_class.phpt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--TEST--
2+
Calling a static method on a non-existing class
3+
--FILE--
4+
<?php
5+
6+
$str = "foo";
7+
try {
8+
Test::{$str . "bar"}();
9+
} catch (Error $e) {
10+
echo $e->getMessage(), "\n";
11+
}
12+
13+
?>
14+
--EXPECT--
15+
Class 'Test' not found

‎Zend/zend_vm_def.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3098,6 +3098,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CLASS_FETCH|CONST|VAR,
30983098
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
30993099
if (UNEXPECTED(ce == NULL)) {
31003100
ZEND_ASSERT(EG(exception));
3101+
FREE_UNFETCHED_OP2();
31013102
HANDLE_EXCEPTION();
31023103
}
31033104
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);

‎Zend/zend_vm_execute.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5417,6 +5417,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
54175417
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
54185418
if (UNEXPECTED(ce == NULL)) {
54195419
ZEND_ASSERT(EG(exception));
5420+
54205421
HANDLE_EXCEPTION();
54215422
}
54225423
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -7378,6 +7379,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
73787379
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
73797380
if (UNEXPECTED(ce == NULL)) {
73807381
ZEND_ASSERT(EG(exception));
7382+
73817383
HANDLE_EXCEPTION();
73827384
}
73837385
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -9466,6 +9468,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
94669468
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
94679469
if (UNEXPECTED(ce == NULL)) {
94689470
ZEND_ASSERT(EG(exception));
9471+
94699472
HANDLE_EXCEPTION();
94709473
}
94719474
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -11488,6 +11491,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
1148811491
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
1148911492
if (UNEXPECTED(ce == NULL)) {
1149011493
ZEND_ASSERT(EG(exception));
11494+
zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
1149111495
HANDLE_EXCEPTION();
1149211496
}
1149311497
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -19460,6 +19464,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
1946019464
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
1946119465
if (UNEXPECTED(ce == NULL)) {
1946219466
ZEND_ASSERT(EG(exception));
19467+
1946319468
HANDLE_EXCEPTION();
1946419469
}
1946519470
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -21259,6 +21264,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
2125921264
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
2126021265
if (UNEXPECTED(ce == NULL)) {
2126121266
ZEND_ASSERT(EG(exception));
21267+
2126221268
HANDLE_EXCEPTION();
2126321269
}
2126421270
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -23859,6 +23865,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
2385923865
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
2386023866
if (UNEXPECTED(ce == NULL)) {
2386123867
ZEND_ASSERT(EG(exception));
23868+
2386223869
HANDLE_EXCEPTION();
2386323870
}
2386423871
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -26359,6 +26366,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
2635926366
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
2636026367
if (UNEXPECTED(ce == NULL)) {
2636126368
ZEND_ASSERT(EG(exception));
26369+
zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
2636226370
HANDLE_EXCEPTION();
2636326371
}
2636426372
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -28278,6 +28286,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
2827828286
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
2827928287
if (UNEXPECTED(ce == NULL)) {
2828028288
ZEND_ASSERT(EG(exception));
28289+
2828128290
HANDLE_EXCEPTION();
2828228291
}
2828328292
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -29055,6 +29064,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
2905529064
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
2905629065
if (UNEXPECTED(ce == NULL)) {
2905729066
ZEND_ASSERT(EG(exception));
29067+
2905829068
HANDLE_EXCEPTION();
2905929069
}
2906029070
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -30887,6 +30897,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
3088730897
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
3088830898
if (UNEXPECTED(ce == NULL)) {
3088930899
ZEND_ASSERT(EG(exception));
30900+
3089030901
HANDLE_EXCEPTION();
3089130902
}
3089230903
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -32602,6 +32613,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
3260232613
ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
3260332614
if (UNEXPECTED(ce == NULL)) {
3260432615
ZEND_ASSERT(EG(exception));
32616+
zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
3260532617
HANDLE_EXCEPTION();
3260632618
}
3260732619
CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);

0 commit comments

Comments
 (0)