summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2023-03-23 14:59:57 +0100
committerGitHub <noreply@github.com>2023-03-23 14:59:57 +0100
commit67614150b5aea347632d2b9ea1f36f24aca1ac9b (patch)
tree8720479cfc4b9b05498c5c048fce20a7c7e7b6ef /lib
parenta5f05dd4a915bd7340b0b8f1c16e4c281ff04e56 (diff)
parent4a2accaa27f6bb0dd28ac6003f1fe90334757323 (diff)
downloadnextcloud-server-67614150b5aea347632d2b9ea1f36f24aca1ac9b.tar.gz
nextcloud-server-67614150b5aea347632d2b9ea1f36f24aca1ac9b.zip
Merge pull request #36636 from nextcloud/fix/oc-image-getimagesize
fix OC_Image: Prevent E_WARNING from getimagesize*
Diffstat (limited to 'lib')
-rw-r--r--lib/private/legacy/OC_Image.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index f2fa2058faa..74e82e62b16 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -598,7 +598,7 @@ class OC_Image implements \OCP\IImage {
* @return bool true if allocating is allowed, false otherwise
*/
private function checkImageSize($path) {
- $size = getimagesize($path);
+ $size = @getimagesize($path);
if (!$size) {
return true;
}
@@ -619,7 +619,7 @@ class OC_Image implements \OCP\IImage {
* @return bool true if allocating is allowed, false otherwise
*/
private function checkImageDataSize($data) {
- $size = getimagesizefromstring($data);
+ $size = @getimagesizefromstring($data);
if (!$size) {
return true;
}