diff options
| author | Git'Fellow <12234510+solracsf@users.noreply.github.com> | 2025-03-18 07:29:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-18 07:29:41 +0100 |
| commit | 4b73246047765b08aa01330c292857a84dd31af4 (patch) | |
| tree | faf1d5e1c76cb73c3d70aa0d9c84b251b124bdbb | |
| parent | 430e23ccb21733e830d05bc5d99b6e5548b9e0ca (diff) | |
| parent | 552c5e8cefbb4feca636750556463b38f6ea8b5e (diff) | |
| download | nextcloud-server-4b73246047765b08aa01330c292857a84dd31af4.tar.gz nextcloud-server-4b73246047765b08aa01330c292857a84dd31af4.zip | |
Merge pull request #51535 from nextcloud/backport/51333/stable30
[stable30] fix(files): Make sure file pointer exists
| -rw-r--r-- | lib/private/Files/Type/Detection.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php index 3676a9b736c..48907b3473f 100644 --- a/lib/private/Files/Type/Detection.php +++ b/lib/private/Files/Type/Detection.php @@ -228,18 +228,18 @@ class Detection implements IMimeTypeDetector { // lets see if it does have mime support $path = escapeshellarg($path); $fp = popen("test -f $path && file -b --mime-type $path", 'r'); - $mimeType = fgets($fp); - pclose($fp); - - if ($mimeType !== false) { - //trim the newline - $mimeType = trim($mimeType); - $mimeType = $this->getSecureMimeType($mimeType); - if ($mimeType !== 'application/octet-stream') { + if ($fp !== false) { + $mimeType = fgets($fp); + pclose($fp); + if ($mimeType !== false) { + //trim the newline + $mimeType = trim($mimeType); + $mimeType = $this->getSecureMimeType($mimeType); return $mimeType; } } } + return 'application/octet-stream'; } |