Skip to content

text-freetype2: Strip embedded nulls from text files #13707

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

text-freetype2: Strip embedded nulls from text files #13707

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
32 changes: 24 additions & 8 deletions plugins/text-freetype2/text-functionality.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,14 +409,21 @@ void load_text_from_file(struct ft2_source *srcdata, const char *filename)
bytes_read = fread(tmp_read, filesize, 1, tmp_file);
fclose(tmp_file);

size_t clean_len = 0;
for (size_t i = 0; i < filesize; i++) {
if (tmp_read[i] != '\0' && tmp_read[i] != '\r') {
tmp_read[clean_len++] = tmp_read[i];
}
}
tmp_read[clean_len] = '\0';

if (srcdata->text != NULL) {
bfree(srcdata->text);
srcdata->text = NULL;
}
srcdata->text = bzalloc((strlen(tmp_read) + 1) * sizeof(wchar_t));
os_utf8_to_wcs(tmp_read, strlen(tmp_read), srcdata->text, (strlen(tmp_read) + 1));
srcdata->text = bzalloc((clean_len + 1) * sizeof(wchar_t));
os_utf8_to_wcs(tmp_read, clean_len, srcdata->text, clean_len + 1);

remove_cr(srcdata->text);
bfree(tmp_read);
}

Expand Down Expand Up @@ -487,18 +494,27 @@ void read_from_end(struct ft2_source *srcdata, const char *filename)
return;
}

tmp_read = bzalloc((filesize - cur_pos) + 1);
bytes_read = fread(tmp_read, filesize - cur_pos, 1, tmp_file);
size_t read_size = filesize - cur_pos;
tmp_read = bzalloc(read_size + 1);
bytes_read = fread(tmp_read, read_size, 1, tmp_file);
fclose(tmp_file);

// FILTER: Strip embedded null bytes (\0) and Windows carriage returns (\r)
size_t clean_len = 0;
for (size_t i = 0; i < read_size; i++) {
if (tmp_read[i] != '\0' && tmp_read[i] != '\r') {
tmp_read[clean_len++] = tmp_read[i];
}
}
tmp_read[clean_len] = '\0';

if (srcdata->text != NULL) {
bfree(srcdata->text);
srcdata->text = NULL;
}
srcdata->text = bzalloc((strlen(tmp_read) + 1) * sizeof(wchar_t));
os_utf8_to_wcs(tmp_read, strlen(tmp_read), srcdata->text, (strlen(tmp_read) + 1));
srcdata->text = bzalloc((clean_len + 1) * sizeof(wchar_t));
os_utf8_to_wcs(tmp_read, clean_len, srcdata->text, clean_len + 1);

remove_cr(srcdata->text);
bfree(tmp_read);
}

Expand Down
Loading