Merge branch 'MDL-76838' of https://github.com/paulholden/moodle

abgreeve · Jun 8, 2023 · 7de0cb3 · 7de0cb3
2 parents d1295a8 + 3bfb7f7
commit 7de0cb3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/backup/util/xml/xml_writer.class.php b/backup/util/xml/xml_writer.class.php
@@ -262,7 +262,7 @@ protected function xml_safe_text_content($content) {
     protected function xml_safe_utf8($content) {
         $content = preg_replace('/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is', '', $content ?? ''); // clean CTRL chars.
         $content = preg_replace("/\r\n|\r/", "\n", $content); // Normalize line&return=>line
-        return $content;
+        return fix_utf8($content);
     }
 
     /**

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -1318,8 +1318,9 @@ function fix_utf8($value) {
             // Shortcut.
             return $value;
         }
-        // No null bytes expected in our data, so let's remove it.
-        $value = str_replace("\0", '', $value);
+
+        // Remove null bytes or invalid Unicode sequences from value.
+        $value = str_replace(["\0", "\xef\xbf\xbe", "\xef\xbf\xbf"], '', $value);
 
         // Note: this duplicates min_fix_utf8() intentionally.
         static $buggyiconv = null;