Skip to content

(bugfix): Protect LogIterator.php from empty array indices #375

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
icewind1991 merged 1 commit into from
Aug 25, 2020
Merged

(bugfix): Protect LogIterator.php from empty array indices #375

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
(bugfix): Protect LogIterator.php from empty array indices 
Add test to verify $entry['time'] is set prior to using it.

Works around #352

Signed-off-by: Matt <[email protected]>
  • Loading branch information
@fsbruva
fsbruva committed Aug 3, 2020
commit ce26d1db6449d32554f8ff52e9ee7cfaedf7e483
8 changes: 5 additions & 3 deletions lib/Log/LogIterator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@ function rewind() {
function current() {
$entry = json_decode($this->lastLine, true);
if ($this->dateFormat !== \DateTime::ATOM) {
$time = \DateTime::createFromFormat($this->dateFormat, $entry['time'], $this->timezone);
if ($time) {
$entry['time'] = $time->format(\DateTime::ATOM);
if (isset($entry['time'])) {
$time = \DateTime::createFromFormat($this->dateFormat, $entry['time'], $this->timezone);
if ($time) {
$entry['time'] = $time->format(\DateTime::ATOM);
}
}
}
return $entry;
Expand Down