Add guard on fclose in Zend_Mail_Storage_Mbox #70
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
glensc
commented
Mar 13, 2021
| @@ -335,7 +335,9 @@ protected function _openMboxFile($filename) | |||
| */ | |||
| public function close() | |||
| { | |||
| @fclose($this->_fh); | |||
| if ($this->_fh && 'Unknown' !== get_resource_type($this->_fh)) { | |||
| @fclose($this->_fh); | |||
There was a problem hiding this comment.
@Megatherium, @falkenhawk should the @-silencer still be applied here?
There was a problem hiding this comment.
I'd probably keep @ just to be extra safe...
Btw, should other @fclose in this class be similarly wrapped, or maybe $this->close() should be used in other places? 🤔
There was a problem hiding this comment.
@Megatherium: Why was this specific fclose() even addressed?
Perhaps the close() method lacks $this->_fh = null; to avoid errors on double close?
There was a problem hiding this comment.
@falkenhawk The close() method also resets $this->_positions, not sure what's the side effect. but seems it's called on open sequence so probably safe to do so...
... and the other call uses private handle
There was a problem hiding this comment.
I think calling close instead of close resulted these failures:
will revert the commit and see :)
|
Looks like the problem this PR is attempting to fix is this output:
however, this doesn't reveal which test this comes from, so need to test this locally with xdebug breakpoint. |
glensc
force-pushed
the
fclose
branch
3 times, most recently
from
99ab1d6
to
968a880
Compare
falkenhawk
approved these changes
Sep 26, 2021
falkenhawk
force-pushed
the
fclose
branch
2 times, most recently
from
a41a413
to
3443f48
Compare
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Extracted changes made by @Megatherium from #32