procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Remove redundant byte-swapping boundary"

Browse source 
This reverts commit daefd6771a.

* src/sfnt.c (sfnt_read_OS_2_table): Restore realignment after
s_family_class, as it occupies byte 32, not 34.  Reported by Pip
Cet <pipcet@protonmail.com>.
This commit is contained in:
Po Lu 2024-08-03 17:34:18 +08:00
parent c25687e860
commit 8d073823c6
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/sfnt.c
View file

@ -16606,10 +16606,10 @@ sfnt_read_OS_2_table (int fd, struct sfnt_offset_subtable *subtable)
OS_2 = xmalloc (sizeof *OS_2);
/* Read data into the structure. */
/* Read data up to the end of `panose'. */
wanted = SFNT_ENDOF (struct sfnt_OS_2_table, fs_last_char_index,
uint16_t);
wanted = SFNT_ENDOF (struct sfnt_OS_2_table, panose,
unsigned char[10]);
rc = read (fd, OS_2, wanted);
if (rc == -1 || rc != wanted)
@ -16636,6 +16636,20 @@ sfnt_read_OS_2_table (int fd, struct sfnt_offset_subtable *subtable)
sfnt_swap16 (&OS_2->y_strikeout_size);
sfnt_swap16 (&OS_2->y_strikeout_position);
sfnt_swap16 (&OS_2->s_family_class);
/* Read fields between ul_unicode_range and fs_last_char_index. */
wanted = (SFNT_ENDOF (struct sfnt_OS_2_table, fs_last_char_index,
uint16_t)
- offsetof (struct sfnt_OS_2_table, ul_unicode_range));
rc = read (fd, &OS_2->ul_unicode_range, wanted);
if (rc == -1 || rc != wanted)
{
xfree (OS_2);
return NULL;
}
/* Swap the remainder and return the table. */
sfnt_swap32 (&OS_2->ul_unicode_range[0]);
sfnt_swap32 (&OS_2->ul_unicode_range[1]);
sfnt_swap32 (&OS_2->ul_unicode_range[2]);

2
src/sfnt.h
View file

@ -1395,6 +1395,8 @@ struct sfnt_OS_2_table
/* Microsoft ``panose'' classification. */
unsigned char panose[10];
/* Alignment boundary! */
/* Unicode range specification. */
uint32_t ul_unicode_range[4];