fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 09:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change cairo_text_cluster_t members signed

Browse source 
Also reject clusters with no text.
This commit is contained in:
Behdad Esfahbod 2008-06-27 11:18:22 -04:00
parent 4530c0b0ec
commit 4ffea75d90
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/cairo.c
View file

@ -3233,17 +3233,18 @@ cairo_show_text_glyphs (cairo_t *cr,
int i;
for (i = 0; i < num_clusters; i++) {
unsigned int cluster_bytes = clusters[i].num_bytes;
unsigned int cluster_glyphs = clusters[i].num_glyphs;
int cluster_bytes = clusters[i].num_bytes;
int cluster_glyphs = clusters[i].num_glyphs;
/* A cluster should cover at least one byte or glyph. */
if (cluster_bytes == 0 && cluster_glyphs == 0)
/* A cluster should cover at least one byte.
* I can't see any use for a 0,0 cluster.
* Zero-glyph clusters on the other hand are useful for
* things like U+200C ZERO WIDTH NON-JOINER */
if (cluster_bytes < 1 || cluster_glyphs < 0)
goto BAD;
/* Since utf8_len and num_glyphs are signed, but the rest of
* values involved here unsigned, we can avoid overflow easily */
if (cluster_bytes > (unsigned int)utf8_len || cluster_glyphs > (unsigned int)num_glyphs)
goto BAD;
/* Since n_bytes and n_glyphs are unsigned, but the rest of
* values involved are signed, we can detect overflow easily */
if (n_bytes+cluster_bytes > (unsigned int)utf8_len || n_glyphs+cluster_glyphs > (unsigned int)num_glyphs)
goto BAD;

4
src/cairo.h
View file

@ -827,8 +827,8 @@ typedef struct {
} cairo_glyph_t;
typedef struct {
unsigned int num_bytes;
unsigned int num_glyphs;
int num_bytes;
int num_glyphs;
} cairo_text_cluster_t;
/**