danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #4266 - prevent OOM when analysing closure unioned with invokable class

Browse Source
This commit is contained in:
Matt Brown 2020-10-02 00:47:42 -04:00 committed by Daniil Gentili
parent a4b6cb83db
commit f63a40f69b
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
3 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
View File

@ -695,7 +695,8 @@ class FunctionCallAnalyzer extends CallAnalyzer
$stmt,
$real_stmt,
$function_name,
$context
$context,
$var_type_part
);
}
}
@ -746,7 +747,8 @@ class FunctionCallAnalyzer extends CallAnalyzer
PhpParser\Node\Expr\FuncCall $stmt,
PhpParser\Node\Expr\FuncCall $real_stmt,
PhpParser\Node\Expr $function_name,
Context $context
Context $context,
Type\Atomic $atomic_type
) : void {
$old_data_provider = $statements_analyzer->node_data;
@ -772,6 +774,8 @@ class FunctionCallAnalyzer extends CallAnalyzer
$statements_analyzer->addSuppressedIssues(['PossiblyInvalidMethodCall']);
}
$statements_analyzer->node_data->setType($function_name, new Type\Union([$atomic_type]));
\Psalm\Internal\Analyzer\Statements\Expression\Call\MethodCallAnalyzer::analyze(
$statements_analyzer,
$fake_method_call,

10
src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
View File

@ -47,7 +47,15 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
$was_inside_use = $context->inside_use;
$context->inside_use = true;
if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->var, $context) === false) {
$existing_stmt_var_type = null;
if (!$real_method_call) {
$existing_stmt_var_type = $statements_analyzer->node_data->getType($stmt->var);
}
if ($existing_stmt_var_type) {
$statements_analyzer->node_data->setType($stmt->var, $existing_stmt_var_type);
} elseif (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->var, $context) === false) {
return false;
}

32
tests/FileManipulation/ReturnTypeManipulationTest.php
View File

@ -575,6 +575,38 @@ class ReturnTypeManipulationTest extends FileManipulationTest
false,
true,
],
'dontOOM' => [
'<?php
class FC {
public function __invoke() : void {}
}
function foo(): string {
if (rand(0, 1)) {
$cb = new FC();
} else {
$cb = function() {};
}
$cb();
}',
'<?php
class FC {
public function __invoke() : void {}
}
function foo(): string {
if (rand(0, 1)) {
$cb = new FC();
} else {
$cb = function() {};
}
$cb();
}',
'7.3',
['InvalidReturnType'],
false,
true,
],
];
}
}