Fixed max value check, improved request value fetching

[friendica.git] / src / Util / ReversedFileReader.php

diff --git a/src/Util/ReversedFileReader.php b/src/Util/ReversedFileReader.php
index 248792f17aa81786f43bda72f9fa49adfce4f797..0566002de29e899e75034972d51f2fa4ad023be1 100644 (file)
--- a/src/Util/ReversedFileReader.php
+++ b/src/Util/ReversedFileReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2021, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -72,7 +72,7 @@ class ReversedFileReader implements \Iterator
 
        /**
         * Read $size bytes behind last position
-        * 
+        *
         * @return string
         */
        private function _read($size)
@@ -85,7 +85,7 @@ class ReversedFileReader implements \Iterator
        /**
         * Read next line from end of file
         * Return null if no lines are left to read
-        * 
+        *
         * @return ?string
         */
        private function _readline()
@@ -95,6 +95,9 @@ class ReversedFileReader implements \Iterator
                        if ($this->pos == 0) {
                                return array_pop($buffer);
                        }
+                       if (is_null($buffer)) {
+                               return null;
+                       }
                        if (count($buffer) > 1) {
                                return array_pop($buffer);
                        }
@@ -104,7 +107,7 @@ class ReversedFileReader implements \Iterator
 
        /**
         * Fetch next line from end and set it as current iterator value.
-        * 
+        *
         * @see Iterator::next()
         * @return void
         */
@@ -116,9 +119,9 @@ class ReversedFileReader implements \Iterator
 
        /**
         * Rewind iterator to the first line at the end of file
-        * 
+        *
         * @see Iterator::rewind()
-        * @return void 
+        * @return void
         */
        public function rewind()
        {
@@ -133,7 +136,7 @@ class ReversedFileReader implements \Iterator
 
        /**
         * Return current line number, starting from zero at the end of file
-        * 
+        *
         * @see Iterator::key()
         * @return int
         */
@@ -144,7 +147,7 @@ class ReversedFileReader implements \Iterator
 
        /**
         * Return current line
-        * 
+        *
         * @see Iterator::current()
         * @return string
         */
@@ -155,7 +158,7 @@ class ReversedFileReader implements \Iterator
 
        /**
         * Checks if current iterator value is valid, that is, we readed all lines in files
-        * 
+        *
         * @see Iterator::valid()
         * @return bool
         */