From 8248f6942f6746bf607d5da473bbbf0ce9e7b8e8 Mon Sep 17 00:00:00 2001 From: Adam Clark Date: Tue, 23 Feb 2021 10:16:59 -0800 Subject: [PATCH 1/3] Quit when message is empty, similar to #9681 --- src/Network/Probe.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Network/Probe.php b/src/Network/Probe.php index f4ca0398a..3eb606483 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -1755,6 +1755,9 @@ class Probe public static function getFeedLink(string $url, string $body) { $doc = new DOMDocument(); + if (empty($body)) { + return ''; + } if (!@$doc->loadHTML($body)) { return false; } From 995d53ebfc8f2e8e5acda79fa079eccb3f6c36f8 Mon Sep 17 00:00:00 2001 From: Adam Clark Date: Tue, 23 Feb 2021 10:18:56 -0800 Subject: [PATCH 2/3] Missed this file when adding. --- src/Content/Text/HTML.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php index 8223aa183..975be8b1f 100644 --- a/src/Content/Text/HTML.php +++ b/src/Content/Text/HTML.php @@ -167,6 +167,10 @@ class HTML $message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8"); + if (empty($message)) { + return ''; + } + @$doc->loadHTML($message, LIBXML_HTML_NODEFDTD); XML::deleteNode($doc, 'style'); @@ -588,6 +592,10 @@ class HTML $message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8"); + if (empty($message)) { + return ''; + } + @$doc->loadHTML($message, LIBXML_HTML_NODEFDTD); $message = $doc->saveHTML(); From 77b24a0b66518b6dc0f129a47f9fd6022742c108 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 23 Feb 2021 16:06:34 -0500 Subject: [PATCH 3/3] Quit earlier in ProbeURL->getFeedLink if body is empty --- src/Network/Probe.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 3eb606483..23eaf299c 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -1754,10 +1754,11 @@ class Probe */ public static function getFeedLink(string $url, string $body) { - $doc = new DOMDocument(); if (empty($body)) { return ''; } + + $doc = new DOMDocument(); if (!@$doc->loadHTML($body)) { return false; }