From 75160b12821f7f4299cce7f0b69c83c1502ae071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= <anton@sijanec.eu>
Date: Mon, 27 May 2024 13:08:29 +0200
Subject: 2024-02-19 upstream

---
 vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php')

diff --git a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php
index 149a5c4..b8c461e 100644
--- a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php
+++ b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php
@@ -1,10 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Db\Reader;
 
 class Util
 {
-    public static function read($stream, $offset, $numberOfBytes)
+    /**
+     * @param resource    $stream
+     * @param int<0, max> $numberOfBytes
+     */
+    public static function read($stream, int $offset, int $numberOfBytes): string
     {
         if ($numberOfBytes === 0) {
             return '';
@@ -15,10 +21,11 @@ class Util
             // We check that the number of bytes read is equal to the number
             // asked for. We use ftell as getting the length of $value is
             // much slower.
-            if (ftell($stream) - $offset === $numberOfBytes) {
+            if ($value !== false && ftell($stream) - $offset === $numberOfBytes) {
                 return $value;
             }
         }
+
         throw new InvalidDatabaseException(
             'The MaxMind DB file contains bad data'
         );
-- 
cgit v1.2.3