From f33e2611632bf6f28948a9351dbd4e981643e4cc Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 11 Oct 2020 13:32:23 +0200 Subject: Fix sanitize feed description (#3222) * Fix sanitize feed description #fix https://github.com/FreshRSS/FreshRSS/issues/3221 * Simplification --- lib/lib_rss.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'lib/lib_rss.php') diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 5c0a8a2bf..64f12c633 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -241,16 +241,25 @@ function customSimplePie($attributes = array()) { return $simplePie; } -function sanitizeHTML($data, $base = '') { - if (!is_string($data)) { +function sanitizeHTML($data, $base = '', $maxLength = false) { + if (!is_string($data) || ($maxLength !== false && $maxLength <= 0)) { return ''; } + if ($maxLength !== false) { + $data = mb_strcut($data, 0, $maxLength, 'UTF-8'); + } static $simplePie = null; if ($simplePie == null) { $simplePie = customSimplePie(); $simplePie->init(); } - return html_only_entity_decode($simplePie->sanitize->sanitize($data, SIMPLEPIE_CONSTRUCT_HTML, $base)); + $result = html_only_entity_decode($simplePie->sanitize->sanitize($data, SIMPLEPIE_CONSTRUCT_HTML, $base)); + if ($maxLength !== false && strlen($result) > $maxLength) { + //Sanitizing has made the result too long so try again shorter + $data = mb_strcut($result, 0, (2 * $maxLength) - strlen($result) - 2, 'UTF-8'); + return sanitizeHTML($data, $base, $maxLength); + } + return $result; } /** -- cgit v1.2.3