Mirrors/Part-DB-server
2
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-03-07 07:48:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use proper implementation of recursion depth limit, that really use the number of recusive calls, not the number of child elements

Browse Source 
This fixes issue #267
This commit is contained in:
Jan Böhmer
2023-04-17 23:59:44 +02:00
parent 303a3690e8
commit 963a22783f
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Repository/AbstractPartsContainingRepository.php
View File

@@ -27,6 +27,7 @@ use InvalidArgumentException;
abstract class AbstractPartsContainingRepository extends StructuralDBElementRepository implements PartsContainingRepositoryInterface
{
/** @var int The maximum number of levels for which we can recurse before throwing an error */
private const RECURSION_LIMIT = 50;
/**
@@ -55,6 +56,24 @@ abstract class AbstractPartsContainingRepository extends StructuralDBElementRepo
*/
public function getPartsCountRecursive(AbstractPartsContainingDBElement $element): int
{
return $this->getPartsCountRecursiveWithDepthN($element, self::RECURSION_LIMIT);
}
/**
* The implementation of the recursive function to get the parts count.
* This function is used to limit the recursion depth (remaining_depth is decreased on each call).
* If the recursion limit is reached (remaining_depth <= 0), a RuntimeException is thrown.
* @internal This function is not intended to be called directly, use getPartsCountRecursive() instead.
* @param AbstractPartsContainingDBElement $element
* @param int $remaining_depth
* @return int
*/
protected function getPartsCountRecursiveWithDepthN(AbstractPartsContainingDBElement $element, int $remaining_depth): int
{
if ($remaining_depth <= 0) {
throw new \RuntimeException('Recursion limit reached!');
}
$count = $this->getPartsCount($element);
//If the element is its own parent, we have a loop in the tree, so we stop here.
@@ -62,12 +81,8 @@ abstract class AbstractPartsContainingRepository extends StructuralDBElementRepo
return 0;
}
$n = 0;
foreach ($element->getChildren() as $child) {
$count += $this->getPartsCountRecursive($child);
if ($n++ > self::RECURSION_LIMIT) {
throw new \RuntimeException('Recursion limit reached!');
}
$count += $this->getPartsCountRecursiveWithDepthN($child, $remaining_depth - 1);
}
return $count;