Skip to content

Fix: prevent fatal crashes on mixed-type reductions and invalid scalar coercion #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tjt263 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: prevent fatal crashes on mixed-type reductions and invalid scalar coercion #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/Reducer/BinaryOpReducer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,16 @@ public function reduceMod(BinaryOp\Mod $node)
{ return $this->postProcess($node, $this->left($node) % $this->right($node)); }

public function reduceMul(BinaryOp\Mul $node)
{ return $this->postProcess($node, $this->left($node) * $this->right($node)); }
{
$left = $this->left($node);
$right = $this->right($node);

if (is_numeric($left) && is_numeric($right)) {
return $this->postProcess($node, $left * $right);
}

return null;
}
public function reduceNotEqual(BinaryOp\NotEqual $node)
{ return $this->postProcess($node, $this->left($node) != $this->right($node)); }

Expand Down
4 changes: 2 additions & 2 deletions src/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Utils
{
public static function scalarToNode($value, $attrs = array())
{
if (!is_array($value)) { // Do this for arrays later
if (is_scalar($value) || $value === null) { // Do this for arrays later
$attrs[AttrName::VALUE] = new ScalarValue($value);
}
if (is_int($value)) {
Expand Down Expand Up @@ -44,7 +44,7 @@ public static function scalarToNode($value, $attrs = array())
$attrs[AttrName::VALUE] = new ArrayVal($valArray);
return new Node\Expr\Array_($items, $attrs);
}
throw new \Exception("Unknown value type");
return null; // Skip unknown value types silently to protect against future weird types without killing deobfuscation
}

public static function getValueRef(Node $node)
Expand Down