Skip to content

fix decode_buffer parsing gb2312 under specific conditions #344

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

Closed
dockfries wants to merge 1 commit into from
Closed

fix decode_buffer parsing gb2312 under specific conditions #344

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
7 changes: 6 additions & 1 deletion src-tauri/src/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ pub fn decode_buffer(buf: Vec<u8>) -> (String, String) {
{
// Use windows-1252 for various combinations
Encoding::for_label("windows-1252".as_bytes()).unwrap_or(UTF_8)
} else if chardetng_encoding == "gbk" || chardet_encoding == "gb2312" {
} else if chardetng_encoding == "gbk"
|| chardet_encoding == "gb2312"
|| (chardetng_encoding == "euc-kr"
&& chardet_encoding == "tis-620"
&& charset_normalizer_encoding == "iso-8859-2")
{
// Use GB18030 when chardetng detects GBK or chardet detects GB2312
Encoding::for_label("GB18030".as_bytes()).unwrap_or(UTF_8)
} else {
Expand Down