Skip to content

Fix UTF-8 header corruption when fallback charset differs #10078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OctopusET wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix UTF-8 header corruption when fallback charset differs #10078

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions program/lib/Roundcube/rcube_mime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,29 @@ public static function decode_mime_string($input, $fallback = null)
// add the last part of the input string
if ($start != strlen($input)) {
$input = substr($input, $start);
$out .= $fallback === false ? $input : rcube_charset::convert($input, $default_charset);
if ($fallback === false) {
$out .= $input;
} elseif (mb_check_encoding($input, 'UTF-8') && preg_match('/[\x80-\xFF]/', $input)) {
// Valid UTF-8 with high bytes - don't corrupt with wrong charset conversion
$out .= $input;
} else {
$out .= rcube_charset::convert($input, $default_charset);
}
}

// return the results
return $out;
}

// no encoding information, use fallback
return $fallback === false ? $input : rcube_charset::convert($input, $default_charset);
if ($fallback === false) {
return $input;
}
// Valid UTF-8 with high bytes - don't corrupt with wrong charset conversion
if (mb_check_encoding($input, 'UTF-8') && preg_match('/[\x80-\xFF]/', $input)) {
return $input;
}
return rcube_charset::convert($input, $default_charset);
}

/**
Expand Down