summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorLouis <6653109+artonge@users.noreply.github.com>2023-03-27 11:51:11 +0200
committerGitHub <noreply@github.com>2023-03-27 11:51:11 +0200
commit9e4bbfb21c7023721c57cb7e3dc16f0c8d6af96c (patch)
tree03c2d53949370c6bdc5bae7f70ce3f46fe8339d6 /lib/private
parent92756f165080a74d745fa7ccab1ef1b90408d858 (diff)
parent73c8296381117a106b0a8fe015479a9fff2c61f6 (diff)
downloadnextcloud-server-9e4bbfb21c7023721c57cb7e3dc16f0c8d6af96c.tar.gz
nextcloud-server-9e4bbfb21c7023721c57cb7e3dc16f0c8d6af96c.zip
Merge pull request #37366 from nextcloud/backport/36636/stable25
[stable25] fix OC_Image: Prevent E_WARNING from getimagesize*
Diffstat (limited to 'lib/private')
-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 51d0d645268..bade2a1af37 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -595,7 +595,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;
}
@@ -616,7 +616,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;
}