Skip to content

Use fstat for file size, reuse it for finding metadata start #189

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

Merged
horgh merged 1 commit into from
May 12, 2025
Merged

Use fstat for file size, reuse it for finding metadata start #189

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
14 changes: 4 additions & 10 deletions src/MaxMind/Db/Reader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ public function __construct(string $database)
}
$this->fileHandle = $fileHandle;

$fileSize = @filesize($database);
if ($fileSize === false) {
$fstat = fstat($fileHandle);
if ($fstat === false) {
throw new \UnexpectedValueException(
"Error determining the size of \"$database\"."
);
}
$this->fileSize = $fileSize;
$this->fileSize = $fstat['size'];

$start = $this->findMetadataStart($database);
$metadataDecoder = new Decoder($this->fileHandle, $start);
Expand Down Expand Up @@ -332,13 +332,7 @@ private function resolveDataPointer(int $pointer)
private function findMetadataStart(string $filename): int
{
$handle = $this->fileHandle;
$fstat = fstat($handle);
if ($fstat === false) {
throw new InvalidDatabaseException(
"Error getting file information ($filename)."
);
}
$fileSize = $fstat['size'];
$fileSize = $this->fileSize;
$marker = self::$METADATA_START_MARKER;
$markerLength = self::$METADATA_START_MARKER_LENGTH;

Expand Down