cheng/libexpat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test unknown encoding with 17-bit top-bit-set character is rejected

Browse Source
This commit is contained in:
Rhodri James 2017-06-09 17:15:57 +01:00 committed by Sebastian Pipping
parent 9bd8391e2c
commit 5aa3ead193
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
expat/tests/runtests.c
View File

@ -5298,7 +5298,8 @@ MiscEncodingHandler(void *data,
!strcmp(encoding, "ascii-like") || !strcmp(encoding, "ascii-like") ||
!strcmp(encoding, "invalid-len") || !strcmp(encoding, "invalid-len") ||
!strcmp(encoding, "invalid-a") || !strcmp(encoding, "invalid-a") ||
!strcmp(encoding, "invalid-surrogate")) !strcmp(encoding, "invalid-surrogate") ||
!strcmp(encoding, "invalid-high"))
high_map = -1; high_map = -1;
for (i = 0; i < 128; ++i) for (i = 0; i < 128; ++i)
@ -5320,6 +5321,9 @@ MiscEncodingHandler(void *data,
*/ */
if (!strcmp(encoding, "invalid-surrogate")) if (!strcmp(encoding, "invalid-surrogate"))
info->map[0x83] = 0xd801; info->map[0x83] = 0xd801;
/* If required, give a top-bit set character too high a value */
if (!strcmp(encoding, "invalid-high"))
info->map[0x84] = 0x010101;
info->data = data; info->data = data;
info->release = NULL; info->release = NULL;
@ -5525,6 +5529,18 @@ START_TEST(test_unknown_encoding_invalid_surrogate)
} }
END_TEST END_TEST
START_TEST(test_unknown_encoding_invalid_high)
{
const char *text =
"<?xml version='1.0' encoding='invalid-high'?>\n"
"<doc>Hello, world</doc>";
XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);
expect_failure(text, XML_ERROR_UNKNOWN_ENCODING,
"Invalid unknown encoding not faulted");
}
END_TEST
/* /*
* Namespaces tests. * Namespaces tests.
@ -10795,6 +10811,7 @@ make_suite(void)
tcase_add_test(tc_basic, test_unknown_encoding_invalid_length); tcase_add_test(tc_basic, test_unknown_encoding_invalid_length);
tcase_add_test(tc_basic, test_unknown_encoding_invalid_topbit); tcase_add_test(tc_basic, test_unknown_encoding_invalid_topbit);
tcase_add_test(tc_basic, test_unknown_encoding_invalid_surrogate); tcase_add_test(tc_basic, test_unknown_encoding_invalid_surrogate);
tcase_add_test(tc_basic, test_unknown_encoding_invalid_high);
suite_add_tcase(s, tc_namespace); suite_add_tcase(s, tc_namespace);
tcase_add_checked_fixture(tc_namespace, tcase_add_checked_fixture(tc_namespace,