validate resource's integrity before using it #14883
Conversation
georgehrke
force-pushed
the
imagepng_expects_resource_issue
branch
from
7176a92 to
39d9023
Compare
|
@georgehrke looks like you missed the memo: b533aad#diff-6a3371457528722a734f3c51d9238c13 🙊 please add a unit test - THX |
|
Missed that 🙈 |
thx |
georgehrke
force-pushed
the
imagepng_expects_resource_issue
branch
from
39d9023 to
1a5de00
Compare
|
Refer to this link for build results (access rights to CI server needed): |
|
👍 |
| */ | ||
| function data() { | ||
| if (!is_resource($this->resource)) { | ||
| $this->logger->debug('OC_Image->data. Not a resource', array('app' => 'core')); |
There was a problem hiding this comment.
debug messages like this (and others in this file) are basically of 0 use. One has no idea on which file this happened.
I'd vote for dropping - having no resource loaded is a valid case.
|
THX @georgehrke for the unit test - and here: have come 🍰 and 🍻 - Happy birthday! |
Thx 😃 |
georgehrke
force-pushed
the
imagepng_expects_resource_issue
branch
from
1a5de00 to
4556d11
Compare
| */ | ||
| function data() { | ||
| if (!is_resource($this->resource)) { |
There was a problem hiding this comment.
Having a closer look - calling valid() here might be a better idea - just in case we ever have to add further validations.
https://github.com/owncloud/core/blob/master/lib/private/image.php#L80
georgehrke
force-pushed
the
imagepng_expects_resource_issue
branch
from
4556d11 to
09b0537
Compare
|
Refer to this link for build results (access rights to CI server needed): |
|
The inspection completed: 1 updated code elements |
|
👍 |
validate resource's integrity before using it
|
@DeepDiver1975 Do we want to back port this? |
should not hurt - please open a pr against stable8 - THX |
|
backport pr: #14917 |
fixes #14036
please review @oparoz @MorrisJobke