Fix PHP8 fatal error when parsing a malformed BODYSTRUCTURE (#9171)

roundcube · Oct 17, 2023 · 6880e08 · 6880e08
1 parent 54fa822
commit 6880e08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - Password: Add ldap_samba_ad driver (#8525)
 - Password: Allow LDAP access using LDAP URI and SASL binding (#8402)
 - Fix potential HTTP protocol version mismatch (#8982)
+- Fix PHP8 fatal error when parsing a malformed BODYSTRUCTURE (#9171)
 
 ## Release 1.6.4
 

diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
@@ -2166,7 +2166,7 @@ protected function structure_part($part, $count = 0, $parent = '', $mime_headers
         }
 
         // read content encoding
-        if (!empty($part[5])) {
+        if (!empty($part[5]) && !is_array($part[5])) {
             $struct->encoding = strtolower($part[5]);
             $struct->headers['content-transfer-encoding'] = $struct->encoding;
         }