Only accept filenames for existing files in getUploadedFileType

[quix0rs-gnu-social.git] / lib / mediafile.php

diff --git a/lib/mediafile.php b/lib/mediafile.php
index ad696ccca6a02df759e51f584094ed2c98b6f7bc..e01d2eaeabc9b896be6f301288c5d125daceee17 100644 (file)
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -252,7 +252,7 @@ class MediaFile
 
         File::respectsQuota($scoped, filesize($stream['uri']));
 
-        $mimetype = MediaFile::getUploadedFileType($fh);
+        $mimetype = MediaFile::getUploadedFileType($stream['uri']);
 
         $filename = File::filename($scoped, "email", $mimetype);
 
@@ -304,19 +304,8 @@ class MediaFile
         // are unambiguous for most image files, but nearly useless
         // for office document formats.
 
-        if (is_string($f)) {
-
-            // assuming a filename
-
-            $filetype = MIME_Type::autoDetect($f);
-
-        } else {
-
-            // assuming a filehandle
-
-            $stream  = stream_get_meta_data($f);
-            $filetype = MIME_Type::autoDetect($stream['uri']);
-        }
+        // We only accept filenames to existing files
+        $filetype = MIME_Type::autoDetect($f);
 
         // The content-based sources for MIME_Type::autoDetect()
         // are wildly unreliable for office-type documents. If we've