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

Make sure we make progress in OOM situations

This commit is contained in:
Behdad Esfahbod 2015-11-06 00:09:26 -08:00
parent 5a7eb5d4d8
commit 68b507a3c3
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hb-buffer-private.hh
View File

@ -175,15 +175,12 @@ struct hb_buffer_t {
{ {
if (unlikely (out_info != info || out_len != idx)) { if (unlikely (out_info != info || out_len != idx)) {
if (unlikely (!make_room_for (1, 1))) if (unlikely (!make_room_for (1, 1)))
{ goto done;
idx++; // So we don't hang indefinitely...
return;
}
out_info[out_len] = info[idx]; out_info[out_len] = info[idx];
} }
out_len++; out_len++;
} }
done:
idx++; idx++;
} }

31
src/hb-buffer.cc
View File

@ -324,7 +324,9 @@ hb_buffer_t::replace_glyphs (unsigned int num_in,
unsigned int num_out, unsigned int num_out,
const uint32_t *glyph_data) const uint32_t *glyph_data)
{ {
if (unlikely (!make_room_for (num_in, num_out))) return; if (unlikely (!make_room_for (num_in, num_out)))
goto done;
{
merge_clusters (idx, idx + num_in); merge_clusters (idx, idx + num_in);
@ -337,39 +339,50 @@ hb_buffer_t::replace_glyphs (unsigned int num_in,
pinfo++; pinfo++;
} }
idx += num_in;
out_len += num_out; out_len += num_out;
}
done:
idx += num_in;
} }
void void
hb_buffer_t::output_glyph (hb_codepoint_t glyph_index) hb_buffer_t::output_glyph (hb_codepoint_t glyph_index)
{ {
if (unlikely (!make_room_for (0, 1))) return; if (unlikely (!make_room_for (0, 1)))
goto done;
out_info[out_len] = info[idx]; out_info[out_len] = info[idx];
out_info[out_len].codepoint = glyph_index; out_info[out_len].codepoint = glyph_index;
out_len++; out_len++;
done:
;
} }
void void
hb_buffer_t::output_info (const hb_glyph_info_t &glyph_info) hb_buffer_t::output_info (const hb_glyph_info_t &glyph_info)
{ {
if (unlikely (!make_room_for (0, 1))) return; if (unlikely (!make_room_for (0, 1)))
goto done;
out_info[out_len] = glyph_info; out_info[out_len] = glyph_info;
out_len++; out_len++;
done:
;
} }
void void
hb_buffer_t::copy_glyph (void) hb_buffer_t::copy_glyph (void)
{ {
if (unlikely (!make_room_for (0, 1))) return; if (unlikely (!make_room_for (0, 1)))
goto done;
out_info[out_len] = info[idx]; out_info[out_len] = info[idx];
out_len++; out_len++;
done:
;
} }
bool bool
@ -387,7 +400,7 @@ hb_buffer_t::move_to (unsigned int i)
if (out_len < i) if (out_len < i)
{ {
unsigned int count = i - out_len; unsigned int count = i - out_len;
if (unlikely (!make_room_for (count, count))) return false; if (unlikely (!make_room_for (count, count))) return false; // XXX verify bailout
memmove (out_info + out_len, info + idx, count * sizeof (out_info[0])); memmove (out_info + out_len, info + idx, count * sizeof (out_info[0]));
idx += count; idx += count;
@ -414,13 +427,15 @@ void
hb_buffer_t::replace_glyph (hb_codepoint_t glyph_index) hb_buffer_t::replace_glyph (hb_codepoint_t glyph_index)
{ {
if (unlikely (out_info != info || out_len != idx)) { if (unlikely (out_info != info || out_len != idx)) {
if (unlikely (!make_room_for (1, 1))) return; if (unlikely (!make_room_for (1, 1)))
goto out;
out_info[out_len] = info[idx]; out_info[out_len] = info[idx];
} }
out_info[out_len].codepoint = glyph_index; out_info[out_len].codepoint = glyph_index;
idx++;
out_len++; out_len++;
out:
idx++;
} }