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

[coretext] Fix buffer resizing 

Was very broken.  Now fixed and tested.
This commit is contained in:
Behdad Esfahbod 2014-08-12 15:49:47 -04:00
parent c3e924fb9e
commit 81b8d9777b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hb-coretext.cc
View File

@ -659,15 +659,24 @@ resize_and_retry:
CFRelease (line); CFRelease (line);
string_ref = NULL; string_ref = NULL;
line = NULL; line = NULL;
/* Get previous start-of-scratch-area, that we use later for readjusting
* our existing scratch arrays. */
unsigned int old_scratch_used;
hb_buffer_t::scratch_buffer_t *old_scratch;
old_scratch = buffer->get_scratch_buffer (&old_scratch_used);
old_scratch_used = scratch - old_scratch;
if (unlikely (!buffer->ensure (buffer->allocated * 2))) if (unlikely (!buffer->ensure (buffer->allocated * 2)))
FAIL ("Buffer resize failed"); FAIL ("Buffer resize failed");
/* Adjust scratch, pchars, and log_cluster arrays. This is ugly, but really the cleanest way to do without /* Adjust scratch, pchars, and log_cluster arrays. This is ugly, but really the
* completely restructuring the rest of this shaper. */ * cleanest way to do without completely restructuring the rest of this shaper. */
hb_buffer_t::scratch_buffer_t *old_scratch = scratch;
scratch = buffer->get_scratch_buffer (&scratch_size); scratch = buffer->get_scratch_buffer (&scratch_size);
pchars = reinterpret_cast<UniChar *> (((char *) scratch + ((char *) pchars - (char *) old_scratch))); pchars = reinterpret_cast<UniChar *> (((char *) scratch + ((char *) pchars - (char *) old_scratch)));
log_clusters = reinterpret_cast<unsigned int *> (((char *) scratch + ((char *) log_clusters - (char *) old_scratch))); log_clusters = reinterpret_cast<unsigned int *> (((char *) scratch + ((char *) log_clusters - (char *) old_scratch)));
scratch += old_scratch_used;
scratch_size -= old_scratch_used;
} }
retry: retry:
{ {
@ -864,7 +873,7 @@ retry:
if (num_glyphs == 0) if (num_glyphs == 0)
continue; continue;
if (!buffer->ensure (buffer->len + num_glyphs)) if (!buffer->ensure_inplace (buffer->len + num_glyphs))
goto resize_and_retry; goto resize_and_retry;
hb_glyph_info_t *run_info = buffer->info + buffer->len; hb_glyph_info_t *run_info = buffer->info + buffer->len;