diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php index 56b75c999cb3d..a79c05e56ecea 100644 --- a/lib/private/legacy/OC_Image.php +++ b/lib/private/legacy/OC_Image.php @@ -447,6 +447,18 @@ protected function getWebpQuality(): int { return min(100, max(10, (int) $quality)); } + private function isValidExifData(array $exif): bool { + if (!isset($exif['Orientation'])) { + return false; + } + + if (!is_numeric($exif['Orientation'])) { + return false; + } + + return true; + } + /** * (I'm open for suggestions on better method name ;) * Get the orientation based on EXIF data. @@ -475,14 +487,11 @@ public function getOrientation(): int { return -1; } $exif = @exif_read_data($this->filePath, 'IFD0'); - if (!$exif) { - return -1; - } - if (!isset($exif['Orientation'])) { + if (!$exif || !$this->isValidExifData($exif)) { return -1; } $this->exif = $exif; - return $exif['Orientation']; + return (int)$exif['Orientation']; } public function readExif($data): void { @@ -496,10 +505,7 @@ public function readExif($data): void { } $exif = @exif_read_data('data://image/jpeg;base64,' . base64_encode($data)); - if (!$exif) { - return; - } - if (!isset($exif['Orientation'])) { + if (!$exif || !$this->isValidExifData($exif)) { return; } $this->exif = $exif;