Merge PR #157

bovigo · Aug 1, 2017 · 1205449 · 1205449
2 parents 03c1427 + 0c05416
commit 1205449
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.6.5 (2017-08-01)
+------------------
+
+   * fixed #157 seeking before beginning of file should fail, reported and fixed by @merijnvdk
+
+
 1.6.4 (2016-07-18)
 ------------------
 

diff --git a/src/main/php/org/bovigo/vfs/content/SeekableFileContent.php b/src/main/php/org/bovigo/vfs/content/SeekableFileContent.php
@@ -52,24 +52,29 @@ protected abstract function doRead($offset, $count);
      */
     public function seek($offset, $whence)
     {
+        $newOffset = $this->offset;
         switch ($whence) {
             case SEEK_CUR:
-                $this->offset += $offset;
-                return true;
+                $newOffset += $offset;
+                break;
 
             case SEEK_END:
-                $this->offset = $this->size() + $offset;
-                return true;
+                $newOffset = $this->size() + $offset;
+                break;
 
             case SEEK_SET:
-                $this->offset = $offset;
-                return true;
+                $newOffset = $offset;
+                break;
 
             default:
                 return false;
         }
-
-        return false;
+
+        if ($newOffset<0) {
+            return false;
+        }
+        $this->offset = $newOffset;
+        return true;
     }
 
     /**

diff --git a/src/test/php/org/bovigo/vfs/vfsStreamFileTestCase.php b/src/test/php/org/bovigo/vfs/vfsStreamFileTestCase.php
@@ -131,6 +131,16 @@ public function seekEmptyFile()
         $this->assertEquals(2, $this->file->getBytesRead());
     }
 
+    /**
+     * @test
+     * @since 1.6.5
+     */
+    public function seekEmptyFileBeforeBeginningDoesNotChangeOffset()
+    {
+        $this->assertFalse($this->file->seek(-5, SEEK_SET), 'Seek before beginning of file');
+        $this->assertEquals(0, $this->file->getBytesRead());
+    }
+
     /**
      * test seeking to offset
      *
@@ -160,6 +170,27 @@ public function seekRead()
         $this->assertEquals(11, $this->file->getBytesRead());
     }
 
+    /**
+     * @test
+     * @since 1.6.5
+     */
+    public function seekFileBeforeBeginningDoesNotChangeOffset()
+    {
+        $this->file->setContent('foobarbaz');
+        $this->assertFalse($this->file->seek(-5, SEEK_SET), 'Seek before beginning of file');
+        $this->assertEquals(0, $this->file->getBytesRead());
+        $this->assertTrue($this->file->seek(2, SEEK_CUR));
+        $this->assertFalse($this->file->seek(-5, SEEK_SET), 'Seek before beginning of file');
+        $this->assertEquals(2, $this->file->getBytesRead());
+        $this->assertEquals('obarbaz', $this->file->readUntilEnd());
+        $this->assertFalse($this->file->seek(-5, SEEK_CUR), 'Seek before beginning of file');
+        $this->assertEquals(2, $this->file->getBytesRead());
+        $this->assertEquals('obarbaz', $this->file->readUntilEnd());
+        $this->assertFalse($this->file->seek(-20, SEEK_END), 'Seek before beginning of file');
+        $this->assertEquals(2, $this->file->getBytesRead());
+        $this->assertEquals('obarbaz', $this->file->readUntilEnd());
+    }
+
     /**
      * test writing data into the file
      *