griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix error in blf_get_sample_text returning a pointer to stack memory

Browse Source 
Copy-by-value was used when iterating over unicode_samples which
then referenced an array from the value.

Resolve by referencing a const pointer to the unicode_sample array.
This commit is contained in:
Campbell Barton
2022-09-30 14:56:01 +10:00
parent 8bdd4b4685
commit dbc097d6b8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenfont/intern/blf_thumbs.c
View File

@@ -258,16 +258,18 @@ static const char32_t *blf_get_sample_text(FT_Face face)
count_bits_i((uint)os2_table->ulUnicodeRange4);
for (uint i = 0; i < ARRAY_SIZE(unicode_samples); ++i) {
UnicodeSample s = unicode_samples[i];
if (os2_table && s.field && s.mask) {
const UnicodeSample *s = &unicode_samples[i];
if (os2_table && s->field && s->mask) {
/* OS/2 Table contains 4 contiguous integers of script coverage bit flags. */
FT_ULong *field = &(os2_table->ulUnicodeRange1) + (s.field - 1);
if (!(*field & (FT_ULong)s.mask)) {
const FT_ULong *unicode_range = &os2_table->ulUnicodeRange1;
const size_t index = (s->field - 1);
BLI_assert(index < 4);
if (!(unicode_range[index] & (FT_ULong)s->mask)) {
continue;
}
}
if (FT_Get_Char_Index(face, s.sample[0]) != 0) {
sample = s.sample;
if (FT_Get_Char_Index(face, s->sample[0]) != 0) {
sample = s->sample;
break;
}
}