wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check whether the file id is valid, before using it to delete the previews

Browse source
This commit is contained in:
Joas Schilling 2015-03-05 16:07:42 +01:00
parent 9f5433c0c3
commit a12e16e985
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/private/preview.php
View file

@ -14,6 +14,7 @@
namespace OC;
use OC\Preview\Provider;
use OCP\Files\FileInfo;
use OCP\Files\NotFoundException;
class Preview {
@ -327,21 +328,21 @@ class Preview {
* deletes all previews of a file
*/
public function deleteAllPreviews() {
$file = $this->getFile();
$fileInfo = $this->getFileInfo($file);
$toDelete = $this->getChildren();
$toDelete[] = $fileInfo;
$toDelete[] = $this->getFileInfo();
foreach ($toDelete as $delete) {
if ($delete !== null && $delete !== false) {
if ($delete instanceof FileInfo) {
/** @var \OCP\Files\FileInfo $delete */
$fileId = $delete->getId();
$previewPath = $this->getPreviewPath($fileId);
$this->userView->deleteAll($previewPath);
$this->userView->rmdir($previewPath);
// getId() might return null, e.g. when the file is a
// .ocTransferId*.part file from chunked file upload.
if (!empty($fileId)) {
$previewPath = $this->getPreviewPath($fileId);
$this->userView->deleteAll($previewPath);
$this->userView->rmdir($previewPath);
}
}
}
}