aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGit'Fellow <12234510+solracsf@users.noreply.github.com>2025-03-07 19:16:30 +0100
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2025-03-17 16:05:04 +0000
commit55f50b485fdd4a8661e615702c4c6eebcaac370e (patch)
tree620d49d1fe6b2e7dea8064fc6d6560a3d7280f8d
parentc1533ab83071667a97b14b22e504b2125eeb6d74 (diff)
downloadnextcloud-server-backport/51333/stable31.tar.gz
nextcloud-server-backport/51333/stable31.zip
fix(files): Make sure file pointer existsbackport/51333/stable31
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
-rw-r--r--lib/private/Files/Type/Detection.php16
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';
}