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

[HB] Always clear positions if dirty, before returning to user

Browse Source
This commit is contained in:
Behdad Esfahbod 2009-08-12 16:50:28 -04:00
parent e4679d9fae
commit b6e66ee102
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-buffer.c
View File

@ -374,7 +374,7 @@ hb_buffer_get_glyph_infos (hb_buffer_t *buffer)
hb_glyph_position_t * hb_glyph_position_t *
hb_buffer_get_glyph_positions (hb_buffer_t *buffer) hb_buffer_get_glyph_positions (hb_buffer_t *buffer)
{ {
if (buffer->in_length && !buffer->positions) if (buffer->have_output || (buffer->in_length && !buffer->positions))
hb_buffer_clear_positions (buffer); hb_buffer_clear_positions (buffer);
return (hb_glyph_position_t *) buffer->positions; return (hb_glyph_position_t *) buffer->positions;
@ -435,7 +435,7 @@ hb_utf8_next (const uint8_t *text,
unsigned int mask, len; unsigned int mask, len;
UTF8_COMPUTE (c, mask, len); UTF8_COMPUTE (c, mask, len);
if (HB_UNLIKELY (!len || end - text < len)) { if (HB_UNLIKELY (!len || (unsigned int) (end - text) < len)) {
*unicode = -1; *unicode = -1;
return text + 1; return text + 1;
} else { } else {