james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #365 from HungryFeline/patch-2

Browse Source 
Don't silently ignore invalid URLs
This commit is contained in:
Shish 2014-01-05 03:14:01 -08:00
commit 952594cdce
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/extension.class.php
View File

@ -142,7 +142,7 @@ abstract class DataHandlerExtension extends Extension {
public function onDataUpload(DataUploadEvent $event) { public function onDataUpload(DataUploadEvent $event) {
global $user; global $user;
if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) { if(($supported_ext = $this->supported_ext($event->type)) && ($check_contents = $this->check_contents($event->tmpname))) {
if(!move_upload_to_archive($event)) return; if(!move_upload_to_archive($event)) return;
send_event(new ThumbnailGenerationEvent($event->hash, $event->type)); send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
@ -197,6 +197,9 @@ abstract class DataHandlerExtension extends Extension {
} }
} }
} }
elseif($supported_ext && !$check_contents){
throw new UploadException("Invalid or corrupted file");
}
} }
public function onThumbnailGeneration(ThumbnailGenerationEvent $event) { public function onThumbnailGeneration(ThumbnailGenerationEvent $event) {