walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[bit-page] Fix sanitizer error 

This essentially reverts 9449cfeefd

Problem was dereferencing pointer at end of array...
This commit is contained in:
Behdad Esfahbod 2021-08-19 00:58:34 -06:00
parent b119b48079
commit 060de189ec
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-bit-page.hh
View File

@ -118,14 +118,17 @@ struct hb_bit_page_t
unsigned int j = m & ELT_MASK; unsigned int j = m & ELT_MASK;
const elt_t vv = v[i] & ~((elt_t (1) << j) - 1); const elt_t vv = v[i] & ~((elt_t (1) << j) - 1);
for (elt_t p = elt_maybe_invert (vv, inverted); for (const elt_t *pp = &vv;
i < len (); i < len ();
p = elt_maybe_invert (v[++i], inverted)) pp = &v[++i])
{
const elt_t p = elt_maybe_invert (*pp, inverted);
if (p) if (p)
{ {
*codepoint = i * ELT_BITS + elt_get_min (p); *codepoint = i * ELT_BITS + elt_get_min (p);
return true; return true;
} }
}
*codepoint = INVALID; *codepoint = INVALID;
return false; return false;
@ -146,16 +149,17 @@ struct hb_bit_page_t
((elt_t (1) << (j + 1)) - 1) : ((elt_t (1) << (j + 1)) - 1) :
(elt_t) -1; (elt_t) -1;
const elt_t vv = v[i] & mask; const elt_t vv = v[i] & mask;
elt_t p = elt_maybe_invert (vv, inverted); const elt_t *pp = &vv;
while (true) while (true)
{ {
const elt_t p = elt_maybe_invert (*pp, inverted);
if (p) if (p)
{ {
*codepoint = i * ELT_BITS + elt_get_max (p); *codepoint = i * ELT_BITS + elt_get_max (p);
return true; return true;
} }
if ((int) i <= 0) break; if ((int) i <= 0) break;
p = elt_maybe_invert (v[--i], inverted); pp = &v[--i];
} }
*codepoint = INVALID; *codepoint = INVALID;