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

Prohibit mixed glyphs/unicode buffers in deserialization

This commit is contained in:
Simon Cozens 2020-09-25 10:04:39 +01:00 committed by Behdad Esfahbod
parent 6b1726b6ef
commit 150f391438
5 changed files with 937 additions and 752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
src/hb-buffer-deserialize-json.hh
View File

@ -39,8 +39,8 @@ static const unsigned char _deserialize_json_trans_keys[] = {
9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 9u, 125u,
120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u,
9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u,
65u, 122u, 34u, 122u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 93u,
9u, 123u, 0u, 0u, 0
65u, 122u, 34u, 122u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u,
9u, 93u, 9u, 123u, 0u, 0u, 0
};
static const char _deserialize_json_key_spans[] = {
@ -49,8 +49,8 @@ static const char _deserialize_json_key_spans[] = {
117, 117, 1, 1, 50, 49, 117, 117,
2, 1, 50, 49, 10, 117, 117, 1,
50, 49, 10, 117, 117, 1, 50, 49,
58, 89, 117, 117, 1, 50, 49, 85,
115, 0
58, 89, 117, 117, 1, 50, 49, 117,
85, 115, 0
};
static const short _deserialize_json_index_offsets[] = {
@ -60,7 +60,7 @@ static const short _deserialize_json_index_offsets[] = {
1327, 1330, 1332, 1383, 1433, 1444, 1562, 1680,
1682, 1733, 1783, 1794, 1912, 2030, 2032, 2083,
2133, 2192, 2282, 2400, 2518, 2520, 2571, 2621,
2707, 2823
2739, 2825, 2941
};
static const char _deserialize_json_indicies[] = {
@ -390,22 +390,37 @@ static const char _deserialize_json_indicies[] = {
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 78, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 68, 69, 69, 69, 69,
69, 69, 69, 69, 69, 1, 79, 79,
79, 79, 79, 1, 1, 1, 1, 1,
1, 1, 1, 79, 80, 80, 80, 80,
80, 80, 80, 80, 80, 1, 73, 73,
73, 73, 73, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 79, 1, 1,
1, 1, 1, 1, 1, 73, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 80, 1, 1, 1, 1, 1, 1,
1, 74, 1, 1, 1, 81, 81, 81,
81, 81, 81, 81, 81, 81, 81, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 81, 1, 0, 0, 0, 0,
0, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 75, 1, 82, 82, 82, 82,
82, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 82, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 83,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
84, 1, 0, 0, 0, 0, 0, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 0, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
@ -416,22 +431,21 @@ static const char _deserialize_json_indicies[] = {
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 2, 1,
1, 0
1, 1, 1, 1, 2, 1, 1, 0
};
static const char _deserialize_json_trans_targs[] = {
1, 0, 2, 2, 3, 4, 18, 24,
37, 44, 5, 12, 6, 7, 8, 9,
11, 9, 11, 10, 2, 47, 10, 47,
11, 9, 11, 10, 2, 48, 10, 48,
13, 14, 15, 16, 17, 16, 17, 10,
2, 47, 19, 20, 21, 22, 23, 10,
2, 47, 23, 25, 31, 26, 27, 28,
29, 30, 29, 30, 10, 2, 47, 32,
2, 48, 19, 20, 21, 22, 23, 10,
2, 48, 23, 25, 31, 26, 27, 28,
29, 30, 29, 30, 10, 2, 48, 32,
33, 34, 35, 36, 35, 36, 10, 2,
47, 38, 39, 40, 42, 43, 41, 10,
41, 10, 2, 47, 43, 45, 46, 47,
48, 49
48, 38, 39, 40, 42, 43, 41, 10,
41, 10, 2, 48, 43, 45, 46, 42,
47, 47, 48, 49, 50
};
static const char _deserialize_json_trans_actions[] = {
@ -443,19 +457,19 @@ static const char _deserialize_json_trans_actions[] = {
8, 9, 0, 0, 0, 0, 0, 2,
2, 2, 0, 0, 10, 10, 11, 0,
0, 2, 2, 2, 0, 0, 12, 12,
13, 0, 0, 0, 2, 2, 2, 14,
0, 15, 15, 16, 0, 0, 0, 0,
0, 0
13, 0, 0, 0, 14, 14, 2, 15,
0, 16, 16, 17, 18, 0, 0, 19,
19, 20, 0, 0, 0
};
static const int deserialize_json_start = 1;
static const int deserialize_json_first_final = 47;
static const int deserialize_json_first_final = 48;
static const int deserialize_json_error = 0;
static const int deserialize_json_en_main = 1;
#line 98 "hb-buffer-deserialize-json.rl"
#line 122 "hb-buffer-deserialize-json.rl"
static hb_bool_t
@ -482,12 +496,12 @@ _hb_buffer_deserialize_json (hb_buffer_t *buffer,
hb_glyph_info_t info = {0};
hb_glyph_position_t pos = {0};
#line 486 "hb-buffer-deserialize-json.hh"
#line 500 "hb-buffer-deserialize-json.hh"
{
cs = deserialize_json_start;
}
#line 491 "hb-buffer-deserialize-json.hh"
#line 505 "hb-buffer-deserialize-json.hh"
{
int _slen;
int _trans;
@ -535,41 +549,117 @@ _resume:
tok = p;
}
break;
case 14:
case 18:
#line 55 "hb-buffer-deserialize-json.rl"
{
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_GLYPHS))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
}
}
break;
case 20:
#line 67 "hb-buffer-deserialize-json.rl"
{
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_UNICODE))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE;
}
}
break;
case 16:
#line 86 "hb-buffer-deserialize-json.rl"
{ if (!parse_uint (tok, p, &info.codepoint)) return false; }
break;
case 8:
#line 87 "hb-buffer-deserialize-json.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
break;
case 10:
#line 88 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.x_offset )) return false; }
break;
case 12:
#line 89 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
break;
case 3:
#line 90 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
break;
case 6:
#line 91 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.y_advance)) return false; }
break;
case 14:
#line 51 "hb-buffer-deserialize-json.rl"
{
tok = p;
}
#line 55 "hb-buffer-deserialize-json.rl"
{
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_GLYPHS))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
}
}
break;
case 19:
#line 51 "hb-buffer-deserialize-json.rl"
{
tok = p;
}
#line 67 "hb-buffer-deserialize-json.rl"
{
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_UNICODE))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE;
}
}
break;
case 15:
#line 79 "hb-buffer-deserialize-json.rl"
{
if (!hb_font_glyph_from_string (font,
tok, p - tok,
&info.codepoint))
return false;
}
#line 55 "hb-buffer-deserialize-json.rl"
{
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_GLYPHS))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
}
}
break;
case 15:
#line 62 "hb-buffer-deserialize-json.rl"
{ if (!parse_uint (tok, p, &info.codepoint)) return false; }
break;
case 8:
#line 63 "hb-buffer-deserialize-json.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
break;
case 10:
#line 64 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.x_offset )) return false; }
break;
case 12:
#line 65 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
break;
case 3:
#line 66 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
break;
case 6:
#line 67 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.y_advance)) return false; }
break;
case 16:
#line 62 "hb-buffer-deserialize-json.rl"
case 17:
#line 86 "hb-buffer-deserialize-json.rl"
{ if (!parse_uint (tok, p, &info.codepoint)) return false; }
#line 43 "hb-buffer-deserialize-json.rl"
{
@ -581,7 +671,7 @@ _resume:
}
break;
case 9:
#line 63 "hb-buffer-deserialize-json.rl"
#line 87 "hb-buffer-deserialize-json.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
#line 43 "hb-buffer-deserialize-json.rl"
{
@ -593,7 +683,7 @@ _resume:
}
break;
case 11:
#line 64 "hb-buffer-deserialize-json.rl"
#line 88 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.x_offset )) return false; }
#line 43 "hb-buffer-deserialize-json.rl"
{
@ -605,7 +695,7 @@ _resume:
}
break;
case 13:
#line 65 "hb-buffer-deserialize-json.rl"
#line 89 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
#line 43 "hb-buffer-deserialize-json.rl"
{
@ -617,7 +707,7 @@ _resume:
}
break;
case 4:
#line 66 "hb-buffer-deserialize-json.rl"
#line 90 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
#line 43 "hb-buffer-deserialize-json.rl"
{
@ -629,7 +719,7 @@ _resume:
}
break;
case 7:
#line 67 "hb-buffer-deserialize-json.rl"
#line 91 "hb-buffer-deserialize-json.rl"
{ if (!parse_int (tok, p, &pos.y_advance)) return false; }
#line 43 "hb-buffer-deserialize-json.rl"
{
@ -640,7 +730,7 @@ _resume:
*end_ptr = p;
}
break;
#line 644 "hb-buffer-deserialize-json.hh"
#line 734 "hb-buffer-deserialize-json.hh"
}
_again:
@ -652,7 +742,7 @@ _again:
_out: {}
}
#line 126 "hb-buffer-deserialize-json.rl"
#line 150 "hb-buffer-deserialize-json.rl"
*end_ptr = p;

28
src/hb-buffer-deserialize-json.rl
View File

@ -52,6 +52,30 @@ action tok {
tok = p;
}
action ensure_glyphs {
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_GLYPHS))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
}
}
action ensure_unicode {
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_UNICODE))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE;
}
}
action parse_glyph {
if (!hb_font_glyph_from_string (font,
tok, p - tok,
@ -78,8 +102,8 @@ glyph_name = alpha (alnum|'_'|'.'|'-')*;
glyph_string = '"' (glyph_name >tok %parse_glyph) '"';
glyph_number = (glyph_id >tok %parse_gid);
glyph = "\"g\"" colon (glyph_string | glyph_number);
codepoint = "\"u\"" colon glyph_number;
glyph = "\"g\"" colon (glyph_string | glyph_number) @ensure_glyphs;
codepoint = "\"u\"" colon glyph_number @ensure_unicode;
cluster = "\"cl\"" colon (unum >tok %parse_cluster);
xoffset = "\"dx\"" colon (num >tok %parse_x_offset);
yoffset = "\"dy\"" colon (num >tok %parse_y_offset);

130
src/hb-buffer-deserialize-text.hh
View File

@ -409,17 +409,17 @@ static const char _deserialize_text_trans_actions[] = {
2, 2, 2, 0, 0, 5, 0, 6,
5, 5, 0, 0, 0, 7, 7, 7,
0, 8, 9, 9, 9, 8, 8, 0,
0, 0, 10, 11, 10, 10, 12, 12,
12, 7, 13, 13, 7, 14, 15, 14,
14, 0, 0
0, 10, 11, 12, 11, 11, 13, 13,
13, 7, 14, 14, 7, 15, 16, 15,
15, 0, 10
};
static const char _deserialize_text_eof_actions[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 5, 0, 0, 0,
7, 7, 8, 0, 0, 8, 10, 12,
12, 10, 7, 14, 14, 7, 8
7, 7, 8, 0, 0, 8, 11, 13,
13, 11, 7, 15, 15, 7, 8
};
static const int deserialize_text_start = 1;
@ -429,7 +429,7 @@ static const int deserialize_text_error = 0;
static const int deserialize_text_en_main = 1;
#line 100 "hb-buffer-deserialize-text.rl"
#line 124 "hb-buffer-deserialize-text.rl"
static hb_bool_t
@ -482,22 +482,29 @@ _resume:
goto _again;
switch ( _deserialize_text_trans_actions[_trans] ) {
case 1:
#line 38 "hb-buffer-deserialize-text.rl"
{
memset (&info, 0, sizeof (info));
memset (&pos , 0, sizeof (pos ));
}
break;
case 2:
#line 51 "hb-buffer-deserialize-text.rl"
{
tok = p;
}
break;
case 9:
case 10:
#line 55 "hb-buffer-deserialize-text.rl"
{
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_GLYPHS))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
}
}
break;
case 9:
#line 79 "hb-buffer-deserialize-text.rl"
{
if (!hb_font_glyph_from_string (font,
tok, p - tok,
&info.codepoint))
@ -505,38 +512,46 @@ _resume:
}
break;
case 6:
#line 62 "hb-buffer-deserialize-text.rl"
#line 86 "hb-buffer-deserialize-text.rl"
{if (!parse_hex (tok, p, &info.codepoint )) return false; }
break;
case 13:
#line 64 "hb-buffer-deserialize-text.rl"
case 14:
#line 88 "hb-buffer-deserialize-text.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
break;
case 4:
#line 65 "hb-buffer-deserialize-text.rl"
#line 89 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.x_offset )) return false; }
break;
case 15:
#line 66 "hb-buffer-deserialize-text.rl"
case 16:
#line 90 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
break;
case 11:
#line 67 "hb-buffer-deserialize-text.rl"
case 12:
#line 91 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
break;
case 3:
case 1:
#line 38 "hb-buffer-deserialize-text.rl"
{
memset (&info, 0, sizeof (info));
memset (&pos , 0, sizeof (pos ));
}
#line 51 "hb-buffer-deserialize-text.rl"
#line 67 "hb-buffer-deserialize-text.rl"
{
tok = p;
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_UNICODE))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE;
}
}
break;
case 8:
#line 55 "hb-buffer-deserialize-text.rl"
#line 79 "hb-buffer-deserialize-text.rl"
{
if (!hb_font_glyph_from_string (font,
tok, p - tok,
@ -553,7 +568,7 @@ _resume:
}
break;
case 5:
#line 62 "hb-buffer-deserialize-text.rl"
#line 86 "hb-buffer-deserialize-text.rl"
{if (!parse_hex (tok, p, &info.codepoint )) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -565,7 +580,7 @@ _resume:
}
break;
case 7:
#line 64 "hb-buffer-deserialize-text.rl"
#line 88 "hb-buffer-deserialize-text.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -576,8 +591,8 @@ _resume:
*end_ptr = p;
}
break;
case 14:
#line 66 "hb-buffer-deserialize-text.rl"
case 15:
#line 90 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -588,8 +603,8 @@ _resume:
*end_ptr = p;
}
break;
case 10:
#line 67 "hb-buffer-deserialize-text.rl"
case 11:
#line 91 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -600,8 +615,8 @@ _resume:
*end_ptr = p;
}
break;
case 12:
#line 68 "hb-buffer-deserialize-text.rl"
case 13:
#line 92 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.y_advance)) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -612,7 +627,30 @@ _resume:
*end_ptr = p;
}
break;
#line 616 "hb-buffer-deserialize-text.hh"
case 3:
#line 38 "hb-buffer-deserialize-text.rl"
{
memset (&info, 0, sizeof (info));
memset (&pos , 0, sizeof (pos ));
}
#line 51 "hb-buffer-deserialize-text.rl"
{
tok = p;
}
#line 55 "hb-buffer-deserialize-text.rl"
{
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_GLYPHS))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
}
}
break;
#line 654 "hb-buffer-deserialize-text.hh"
}
_again:
@ -625,7 +663,7 @@ _again:
{
switch ( _deserialize_text_eof_actions[cs] ) {
case 8:
#line 55 "hb-buffer-deserialize-text.rl"
#line 79 "hb-buffer-deserialize-text.rl"
{
if (!hb_font_glyph_from_string (font,
tok, p - tok,
@ -642,7 +680,7 @@ _again:
}
break;
case 5:
#line 62 "hb-buffer-deserialize-text.rl"
#line 86 "hb-buffer-deserialize-text.rl"
{if (!parse_hex (tok, p, &info.codepoint )) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -654,7 +692,7 @@ _again:
}
break;
case 7:
#line 64 "hb-buffer-deserialize-text.rl"
#line 88 "hb-buffer-deserialize-text.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -665,8 +703,8 @@ _again:
*end_ptr = p;
}
break;
case 14:
#line 66 "hb-buffer-deserialize-text.rl"
case 15:
#line 90 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -677,8 +715,8 @@ _again:
*end_ptr = p;
}
break;
case 10:
#line 67 "hb-buffer-deserialize-text.rl"
case 11:
#line 91 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -689,8 +727,8 @@ _again:
*end_ptr = p;
}
break;
case 12:
#line 68 "hb-buffer-deserialize-text.rl"
case 13:
#line 92 "hb-buffer-deserialize-text.rl"
{ if (!parse_int (tok, p, &pos.y_advance)) return false; }
#line 43 "hb-buffer-deserialize-text.rl"
{
@ -701,14 +739,14 @@ _again:
*end_ptr = p;
}
break;
#line 705 "hb-buffer-deserialize-text.hh"
#line 743 "hb-buffer-deserialize-text.hh"
}
}
_out: {}
}
#line 124 "hb-buffer-deserialize-text.rl"
#line 148 "hb-buffer-deserialize-text.rl"
*end_ptr = p;

28
src/hb-buffer-deserialize-text.rl
View File

@ -52,6 +52,30 @@ action tok {
tok = p;
}
action ensure_glyphs {
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_GLYPHS))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
}
}
action ensure_unicode {
if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_UNICODE))
{
if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) {
buffer->clear();
return false;
}
assert (buffer->len == 0);
buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE;
}
}
action parse_glyph {
if (!hb_font_glyph_from_string (font,
tok, p - tok,
@ -73,13 +97,13 @@ num = '-'? unum;
glyph_id = unum;
glyph_name = alpha (alnum|'_'|'.'|'-')*;
glyph = (glyph_id | glyph_name) >tok %parse_glyph;
glyph = (glyph_id | glyph_name) >tok @ensure_glyphs %parse_glyph;
cluster = '=' (unum >tok %parse_cluster);
offsets = '@' (num >tok %parse_x_offset) ',' (num >tok %parse_y_offset );
advances= '+' (num >tok %parse_x_advance) (',' (num >tok %parse_y_advance))?;
codepoint = xdigit+ >tok %parse_hexdigits;
unicode_id = 'U' '+' >clear_item codepoint cluster? %add_item;
unicode_id = 'U' '+' >clear_item @ensure_unicode codepoint cluster? %add_item;
item =
(

15
test/api/test-buffer.c
View File

@ -860,11 +860,16 @@ typedef struct {
const char *contents;
hb_buffer_serialize_format_t format;
unsigned int num_items;
hb_bool_t success;
} serialization_test_t;
static const serialization_test_t serialization_tests[] = {
{ "<U+0640=0|U+0635=1>", HB_BUFFER_SERIALIZE_FORMAT_TEXT, 2 },
{ "[{\"u\":1600,\"cl\":0},{\"u\":1589,\"cl\":1}]", HB_BUFFER_SERIALIZE_FORMAT_JSON, 2 },
{ "<U+0640=0|U+0635=1>", HB_BUFFER_SERIALIZE_FORMAT_TEXT, 2, 1 },
{ "[{\"u\":1600,\"cl\":0},{\"u\":1589,\"cl\":1}]", HB_BUFFER_SERIALIZE_FORMAT_JSON, 2, 1 },
/* Mixed glyphs/Unicodes -> parse fail */
{ "[{\"u\":1600,\"cl\":0},{\"g\":1589,\"cl\":1}]", HB_BUFFER_SERIALIZE_FORMAT_JSON, 0, 0 },
{ "<U+0640=0|uni0635=1>", HB_BUFFER_SERIALIZE_FORMAT_TEXT, 0, 0 },
};
static void
@ -877,6 +882,7 @@ test_buffer_serialize_deserialize (void)
{
unsigned int num_glyphs, consumed;
char round_trip[1024];
hb_bool_t retval;
b = hb_buffer_create ();
hb_buffer_set_replacement_codepoint (b, (hb_codepoint_t) -1);
@ -884,7 +890,10 @@ test_buffer_serialize_deserialize (void)
const serialization_test_t *test = &serialization_tests[i];
g_test_message ("serialize test #%d", i);
hb_buffer_deserialize_unicode (b, test->contents, -1, NULL, test->format);
retval = hb_buffer_deserialize_unicode (b, test->contents, -1, NULL, test->format);
if (test->success == 0)
continue; // Expected parse failure, got one, don't round-trip
num_glyphs = hb_buffer_get_length (b);
g_assert_cmpint (num_glyphs, ==, test->num_items);