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

Make hb_tag_from_string(NULL) return HB_TAG_NONE

This commit is contained in:
Behdad Esfahbod 2011-04-11 13:27:30 -04:00
parent 02f6e62d6c
commit 7ff7401c92
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-common.c
View File

@ -35,6 +35,9 @@ hb_tag_from_string (const char *s)
char tag[4]; char tag[4];
unsigned int i; unsigned int i;
if (!s)
return HB_TAG_NONE;
for (i = 0; i < 4 && s[i]; i++) for (i = 0; i < 4 && s[i]; i++)
tag[i] = s[i]; tag[i] = s[i];
for (; i < 4; i++) for (; i < 4; i++)

3
test/test-types.c
View File

@ -83,6 +83,7 @@ static void
test_types_tag (void) test_types_tag (void)
{ {
g_assert_cmphex (HB_TAG_NONE, ==, 0); g_assert_cmphex (HB_TAG_NONE, ==, 0);
g_assert_cmphex (HB_TAG ('a','B','c','D'), ==, 0x61426344); g_assert_cmphex (HB_TAG ('a','B','c','D'), ==, 0x61426344);
g_assert_cmphex (HB_TAG_CHAR4 ("aBcD"), ==, 0x61426344); g_assert_cmphex (HB_TAG_CHAR4 ("aBcD"), ==, 0x61426344);
@ -93,6 +94,8 @@ test_types_tag (void)
g_assert_cmphex (hb_tag_from_string ("aB"), ==, 0x61422020); g_assert_cmphex (hb_tag_from_string ("aB"), ==, 0x61422020);
g_assert_cmphex (hb_tag_from_string ("a"), ==, 0x61202020); g_assert_cmphex (hb_tag_from_string ("a"), ==, 0x61202020);
g_assert_cmphex (hb_tag_from_string (""), ==, 0x20202020); g_assert_cmphex (hb_tag_from_string (""), ==, 0x20202020);
g_assert_cmphex (hb_tag_from_string (NULL), ==, HB_TAG_NONE);
} }
int int