Skip to content

Do not attempt to read 0 bytes when manually iterating over a non-seekable file #25804

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
rullzer merged 1 commit into from
Mar 1, 2021
Merged

Do not attempt to read 0 bytes when manually iterating over a non-seekable file #25804

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
Properly end iterating over the file once the target has been reached 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Feb 26, 2021
commit 19eb48b8a3597943d5d677d8caf318392613d86b
2 changes: 1 addition & 1 deletion lib/private/Files/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public function readfilePart($path, $from, $to) {
// forward file handle via chunked fread because fseek seem to have failed

$end = $from + 1;
while (!feof($handle) && ftell($handle) < $end) {
while (!feof($handle) && ftell($handle) < $end && ftell($handle) !== $from) {
$len = $from - ftell($handle);
if ($len > $chunkSize) {
$len = $chunkSize;
Expand Down