CVE-2023-26044: Merge pull request from GHSA-95x4-j7vc-h8mf · reactphp/http@9681f76

Expand Up

@@ -26,6 +26,13 @@ final class MultipartParser

*/

private $maxFileSize;

/**

* Based on $maxInputVars and $maxFileUploads

*

* @var int

*/

private $maxMultipartBodyParts;

/**

* ini setting “max_input_vars”

*

Expand Down Expand Up

@@ -62,6 +69,7 @@ final class MultipartParser

*/

private $maxFileUploads;

private $multipartBodyPartCount = 0;

private $postCount = 0;

private $filesCount = 0;

private $emptyCount = 0;

Expand All

@@ -87,6 +95,8 @@ public function __construct($uploadMaxFilesize = null, $maxFileUploads = null)

$this->uploadMaxFilesize = IniUtil::iniSizeToBytes($uploadMaxFilesize);

$this->maxFileUploads = $maxFileUploads === null ? (\ini_get(‘file_uploads’) === ‘’ ? 0 : (int)\ini_get(‘max_file_uploads’)) : (int)$maxFileUploads;

$this->maxMultipartBodyParts = $this->maxInputVars + $this->maxFileUploads;

}

public function parse(ServerRequestInterface $request)

Expand All

@@ -101,6 +111,7 @@ public function parse(ServerRequestInterface $request)

$request = $this->request;

$this->request = null;

$this->multipartBodyPartCount = 0;

$this->postCount = 0;

$this->filesCount = 0;

$this->emptyCount = 0;

Expand Down Expand Up

@@ -128,6 +139,10 @@ private function parseBody($boundary, $buffer)

// parse one part and continue searching for next

$this->parsePart(\substr($buffer, $start, $end - $start));

$start = $end;

if (++$this->multipartBodyPartCount > $this->maxMultipartBodyParts) {

break;

}

}

}

Expand Down