Skip to content
Snippets Groups Projects
Commit 5433a504 authored by Georg Ehrke's avatar Georg Ehrke
Browse files

validate size of file

parent d8008ae4
No related branches found
No related tags found
No related merge requests found
...@@ -88,6 +88,14 @@ class Preview { ...@@ -88,6 +88,14 @@ class Preview {
} }
} }
$fileinfo = $this->fileview->getFileInfo($this->file);
if(array_key_exists('size', $fileinfo)){
if((int) $fileinfo['size'] === 0){
\OC_Log::write('core', 'You can\'t generate a preview of a 0 byte file (' . $this->file . ')', \OC_Log::ERROR);
throw new \Exception('0 byte file given');
}
}
//init providers //init providers
if(empty(self::$providers)) { if(empty(self::$providers)) {
self::initProviders(); self::initProviders();
...@@ -518,7 +526,7 @@ class Preview { ...@@ -518,7 +526,7 @@ class Preview {
try{ try{
$preview = new Preview(\OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); $preview = new Preview(\OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup);
$preview->showPreview(); $preview->showPreview();
}catch(Exception $e) { }catch(\Exception $e) {
\OC_Response::setStatus(404); \OC_Response::setStatus(404);
\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
exit; exit;
...@@ -574,7 +582,7 @@ class Preview { ...@@ -574,7 +582,7 @@ class Preview {
try{ try{
$preview = new Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); $preview = new Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup);
$preview->showPreview(); $preview->showPreview();
}catch(Exception $e) { }catch(\Exception $e) {
\OC_Response::setStatus(404); \OC_Response::setStatus(404);
\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
exit; exit;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment