Enhance error handling in encoding functions and update TOC test with static HTML content

Author: michalschroeder

src/PhpWord/Shared/Microsoft/PasswordEncoder.php

@@ -18,6 +18,8 @@
 
 namespace PhpOffice\PhpWord\Shared\Microsoft;
 
+use PhpOffice\PhpWord\Exception\Exception;
+
 /**
  * Password encoder for microsoft office applications.
  */
@@ -119,8 +121,11 @@ public static function hashPassword($password, $algorithmName = self::ALGORITHM_
         //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
         //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
         $passUtf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
-        $byteChars = [];
+        if (!is_string($passUtf8)) {
+            throw new Exception('Failed to convert password to UCS-2LE');
+        }
 
+        $byteChars = [];
         for ($i = 0; $i < mb_strlen($password); ++$i) {
             $byteChars[$i] = ord(substr($passUtf8, $i * 2, 1));
 

src/PhpWord/Shared/Text.php

@@ -18,6 +18,8 @@
 
 namespace PhpOffice\PhpWord\Shared;
 
+use PhpOffice\PhpWord\Exception\Exception;
+
 /**
  * Text.
  */
@@ -148,6 +150,9 @@ public static function toUTF8($value = '')
         if (null !== $value && !self::isUTF8($value)) {
             // PHP8.2 : utf8_encode is deprecated, but mb_convert_encoding always usable
             $value = (function_exists('mb_convert_encoding')) ? mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1') : utf8_encode($value);
+            if ($value === false) {
+                throw new Exception('Unable to convert text to UTF-8');
+            }
         }
 
         return $value;

tests/bootstrap.php

@@ -54,7 +54,9 @@ function phpunit10ErrorHandler(int $errno, string $errstr, string $filename, int
 
 function utf8decode(string $value, string $toEncoding = 'ISO-8859-1'): string
 {
-    return function_exists('mb_convert_encoding') ? mb_convert_encoding($value, $toEncoding, 'UTF-8') : utf8_decode($value);
+    $result = function_exists('mb_convert_encoding') ? mb_convert_encoding($value, $toEncoding, 'UTF-8') : utf8_decode($value);
+
+    return $result === false ? '' : $result;
 }
 
 if (!method_exists(PHPUnit\Framework\TestCase::class, 'setOutputCallback')) {