jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text-freetype2: Fix incorrect fread argument order

Browse Source 
This fixes UTF-16 BOM files being loaded incorrectly and having their
newlines parsed incorrectly in read from end mode. Detected by PVS
Studio.
This commit is contained in:
Richard Stanway 2022-01-17 23:32:36 +01:00
parent a3e3ee8a8b
commit 1af1a432e2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/text-freetype2/text-functionality.c
View File

@ -437,7 +437,7 @@ void load_text_from_file(struct ft2_source *srcdata, const char *filename)
fseek(tmp_file, 0, SEEK_END); fseek(tmp_file, 0, SEEK_END);
filesize = (uint32_t)ftell(tmp_file); filesize = (uint32_t)ftell(tmp_file);
fseek(tmp_file, 0, SEEK_SET); fseek(tmp_file, 0, SEEK_SET);
bytes_read = fread(&header, 2, 1, tmp_file); bytes_read = fread(&header, 1, 2, tmp_file);
if (bytes_read == 2 && header == 0xFEFF) { if (bytes_read == 2 && header == 0xFEFF) {
// File is already in UTF-16 format // File is already in UTF-16 format
@ -491,7 +491,7 @@ void read_from_end(struct ft2_source *srcdata, const char *filename)
} }
return; return;
} }
bytes_read = fread(&value, 2, 1, tmp_file); bytes_read = fread(&value, 1, 2, tmp_file);
if (bytes_read == 2 && value == 0xFEFF) if (bytes_read == 2 && value == 0xFEFF)
utf16 = true; utf16 = true;
@ -513,7 +513,7 @@ void read_from_end(struct ft2_source *srcdata, const char *filename)
if (bytes_read == 1 && bvalue == '\n') if (bytes_read == 1 && bvalue == '\n')
line_breaks++; line_breaks++;
} else { } else {
bytes_read = fread(&value, 2, 1, tmp_file); bytes_read = fread(&value, 1, 2, tmp_file);
if (bytes_read == 2 && value == L'\n') if (bytes_read == 2 && value == L'\n')
line_breaks++; line_breaks++;
} }