Skip to content

fix OC_Image: Prevent E_WARNING from getimagesize* #36636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szaimen merged 1 commit into from
Mar 23, 2023
Merged

fix OC_Image: Prevent E_WARNING from getimagesize* #36636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix OC_Image: Prevent E_WARNING from getimagesize* 
Signed-off-by: Marcel Klehr <[email protected]>
  • Loading branch information
@marcelklehr @szaimen
marcelklehr authored and szaimen committed Mar 16, 2023
commit 4a2accaa27f6bb0dd28ac6003f1fe90334757323
4 changes: 2 additions & 2 deletions lib/private/legacy/OC_Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ private function checkImageMemory($width, $height) {
* @return bool true if allocating is allowed, false otherwise
*/
private function checkImageSize($path) {
$size = getimagesize($path);
$size = @getimagesize($path);
if (!$size) {
return true;
}
Expand All @@ -619,7 +619,7 @@ private function checkImageSize($path) {
* @return bool true if allocating is allowed, false otherwise
*/
private function checkImageDataSize($data) {
$size = getimagesizefromstring($data);
$size = @getimagesizefromstring($data);
if (!$size) {
return true;
}
Expand Down