PHP8 catch ValueError for loadHTML()#673
Merged
mblaney merged 1 commit intosimplepie:masterfrom Mar 23, 2021
Merged
Conversation
Fix ``` PHP Fatal error: Uncaught ValueError: DOMDocument::loadHTML(): Argument #1 ($source) must not be empty in /SimplePie/Locator.php:83 ``` `set_error_handler` does not catch ValueError in PHP8 The code is compatible PHP5 and PHP7. Fix downstream bug FreshRSS/FreshRSS#3537 Downstream PR FreshRSS/FreshRSS#3547
klausenbusk
reviewed
Mar 20, 2021
| $this->curl_options = $curl_options; | ||
|
|
||
| if (class_exists('DOMDocument')) | ||
| if (class_exists('DOMDocument') && $this->file->body != '') |
There was a problem hiding this comment.
Wouldn't it be better to use the empty() function? Can it be null?
Contributor
Author
There was a problem hiding this comment.
loadHTML() will raise an error if the input is null or empty. This test covers both.
| { | ||
| $this->dom->loadHTML($this->file->body); | ||
| } | ||
| catch (Throwable $ex) |
There was a problem hiding this comment.
Is this needed or is it more better safe than sorry?
Contributor
Author
There was a problem hiding this comment.
There are potentially other errors than just empty input. For this specific bug, using either the null/empty test or the catch is sufficient. The catch is to more specifically extend the set_error_handler.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fix
set_error_handlerdoes not catch ValueError in PHP8.The patch is compatible PHP5 and PHP7.
Fix downstream bug FreshRSS/FreshRSS#3537
Downstream PR FreshRSS/FreshRSS#3547