Skip to content

Allow base64 detection to work also with double-LFs. #136

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow base64 detection to work also with double-LFs. #136

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
11 changes: 10 additions & 1 deletion precomp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4402,6 +4402,15 @@ bool compress_file(float min_percent, float max_percent) {
break;
}
}
if ((in_buf[cb + base64_header_length] == 10) && (in_buf[cb + base64_header_length + 1] == 10)) {
found_double_crlf = true;
base64_header_length += 2;
// skip additional LFs
while ((in_buf[cb + base64_header_length] == 10)) {
base64_header_length += 1;
}
break;
}
base64_header_length++;
} while (base64_header_length < (CHECKBUF_SIZE - 2));

Expand Down Expand Up @@ -7333,7 +7342,7 @@ void try_decompression_base64(int base64_header_length) {
continue;
}
if ((in[j] == 13) || (in[j] == 10)) {
if (in[j] == 13) {
if (in[j] == 10) {
cr_count++;
if (cr_count == 2) { // double CRLF -> base64 end
stream_finished = true;
Expand Down