mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Correctly bisect format 12 and 8 cmap tables

Browse Source 
* src/sfnt.c (sfnt_bsearch_above): Cease returning the last
element if it is ordered below the key itself.
(sfnt_lookup_glyph_8, sfnt_lookup_glyph_12): Verify whether the
group returned is NULL.
This commit is contained in:
Po Lu 2023-10-18 13:52:19 +08:00
parent 516b490bb4
commit 06fc5c2417
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sfnt.c
View File

@ -1122,8 +1122,8 @@ sfnt_lookup_glyph_2 (sfnt_char character,
: 0);
}
/* Like `bsearch'. However, return the highest element above KEY if
it could not be found. */
/* Like `bsearch', but return the element ordered exactly above KEY if
one exists and KEY itself cannot be located. */
static void *
sfnt_bsearch_above (const void *key, const void *base,
@ -1146,12 +1146,18 @@ sfnt_bsearch_above (const void *key, const void *base,
mid = low + (high - low) / 2;
sample = bytes + mid * size;
if (compar (key, sample) > 0)
if ((*compar) (key, sample) > 0)
low = mid + 1;
else
high = mid;
}
sample = bytes + low * size;
if (low == nmemb - 1
&& (*compar) (key, sample) > 0)
return NULL;
return (unsigned char *) bytes + low * size;
}
@ -1287,7 +1293,7 @@ sfnt_lookup_glyph_8 (sfnt_char character,
sizeof format8->groups[0],
sfnt_compare_char);
if (group->start_char_code > character)
if (!group || group->start_char_code > character)
/* No glyph matches this group. */
return 0;
@ -1336,7 +1342,7 @@ sfnt_lookup_glyph_12 (sfnt_char character,
sizeof format12->groups[0],
sfnt_compare_char);
if (group->start_char_code > character)
if (!group || group->start_char_code > character)
/* No glyph matches this group. */
return 0;