Skip to content
Open
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions include/cli/modules/file.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ function run($args, $options) {
$this->stderr->write('IOError: '.$e->getMessage());
}
}
$this->stdout->write("Migrated $count files\n");
$this->stdout->write("Migrated $count files
");
break;

/**
Expand Down Expand Up @@ -289,9 +290,13 @@ function run($args, $options) {
if (strlen($header) != $hlen)
$this->fail('Short read getting header info');

$header = unserialize($header);
if (!$header)
// Deserialize header with restricted classes and validate structure
$header = unserialize($header, ['allowed_classes' => false]);
if ($header === false)
$this->fail('Unable to decipher file header');
if (!is_array($header) || !isset($header['file']) || !is_array($header['file'])) {
$this->fail('Invalid file header');
}

// Find or create the file record
$finfo = $header['file'];
Expand Down