diff --git a/expat/tests/acc_tests.c b/expat/tests/acc_tests.c index e630658c..92b71504 100644 --- a/expat/tests/acc_tests.c +++ b/expat/tests/acc_tests.c @@ -57,183 +57,183 @@ #if XML_GE == 1 START_TEST(test_accounting_precision) { struct AccountingTestCase cases[] = { - {"", NULL, NULL, 0}, - {"", NULL, NULL, 0}, + {"", NULL, NULL, 0}, + {"", NULL, NULL, 0}, - /* Attributes */ - {"", NULL, NULL, 0}, - {"", NULL, NULL, 0}, - {"", NULL, NULL, 0}, - {"", NULL, NULL, - sizeof(XML_Char) * 5 /* number of predefined entities */}, - {"\n" - " \n" - "", - NULL, NULL, 0}, + /* Attributes */ + {"", NULL, NULL, 0}, + {"", NULL, NULL, 0}, + {"", NULL, NULL, 0}, + {"", NULL, NULL, + sizeof(XML_Char) * 5 /* number of predefined entities */}, + {"\n" + " \n" + "", + NULL, NULL, 0}, - /* Text */ - {"text", NULL, NULL, 0}, - {"text1text2", NULL, NULL, 0}, - {"&'><"", NULL, NULL, - sizeof(XML_Char) * 5 /* number of predefined entities */}, - {"A)", NULL, NULL, 0}, + /* Text */ + {"text", NULL, NULL, 0}, + {"text1text2", NULL, NULL, 0}, + {"&'><"", NULL, NULL, + sizeof(XML_Char) * 5 /* number of predefined entities */}, + {"A)", NULL, NULL, 0}, - /* Prolog */ - {"", NULL, NULL, 0}, + /* Prolog */ + {"", NULL, NULL, 0}, - /* Whitespace */ - {" ", NULL, NULL, 0}, - {"", NULL, NULL, 0}, - {"", NULL, NULL, 0}, + /* Whitespace */ + {" ", NULL, NULL, 0}, + {"", NULL, NULL, 0}, + {"", NULL, NULL, 0}, - /* Comments */ - {"", NULL, NULL, 0}, + /* Comments */ + {"", NULL, NULL, 0}, - /* Processing instructions */ - {"", - NULL, NULL, 0}, - {"", NULL, NULL, 0}, + /* Processing instructions */ + {"", + NULL, NULL, 0}, + {"", NULL, NULL, 0}, # ifdef XML_DTD - {"", - "%e1;", "", - 0}, + {"", + "%e1;", "", + 0}, # endif /* XML_DTD */ - /* CDATA */ - {"", NULL, NULL, 0}, - /* The following is the essence of this OSS-Fuzz finding: - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34302 - https://oss-fuzz.com/testcase-detail/4860575394955264 - */ - {"333\">\n" - "]>\n" - "&e;\n", - NULL, NULL, sizeof(XML_Char) * strlen("111333")}, + /* CDATA */ + {"", NULL, NULL, 0}, + /* The following is the essence of this OSS-Fuzz finding: + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34302 + https://oss-fuzz.com/testcase-detail/4860575394955264 + */ + {"333\">\n" + "]>\n" + "&e;\n", + NULL, NULL, sizeof(XML_Char) * strlen("111333")}, # ifdef XML_DTD - /* Conditional sections */ - {"\n" - "\n" - "\n" - "%import;\n" - "]>\n" - "\n", - "]]>\n" - "]]>", - NULL, sizeof(XML_Char) * (strlen("INCLUDE") + strlen("IGNORE"))}, + /* Conditional sections */ + {"\n" + "\n" + "\n" + "%import;\n" + "]>\n" + "\n", + "]]>\n" + "]]>", + NULL, sizeof(XML_Char) * (strlen("INCLUDE") + strlen("IGNORE"))}, # endif /* XML_DTD */ - /* General entities */ - {"\n" - "]>\n" - "&nine;", - NULL, NULL, sizeof(XML_Char) * strlen("123456789")}, - {"\n" - "]>\n" - "", - NULL, NULL, sizeof(XML_Char) * strlen("123456789")}, - {"\n" - "\n" - "]>\n" - "&nine2;&nine2;&nine2;", - NULL, NULL, - sizeof(XML_Char) * 3 /* calls to &nine2; */ * 2 /* calls to &nine; */ - * (strlen("&nine;") + strlen("123456789"))}, - {"\n" - "]>\n" - "&five;", - "12345", NULL, 0}, - {"\n" - "]>\n" - "&five;", - "\xEF\xBB\xBF" /* UTF-8 BOM */, NULL, 0}, + /* General entities */ + {"\n" + "]>\n" + "&nine;", + NULL, NULL, sizeof(XML_Char) * strlen("123456789")}, + {"\n" + "]>\n" + "", + NULL, NULL, sizeof(XML_Char) * strlen("123456789")}, + {"\n" + "\n" + "]>\n" + "&nine2;&nine2;&nine2;", + NULL, NULL, + sizeof(XML_Char) * 3 /* calls to &nine2; */ * 2 /* calls to &nine; */ + * (strlen("&nine;") + strlen("123456789"))}, + {"\n" + "]>\n" + "&five;", + "12345", NULL, 0}, + {"\n" + "]>\n" + "&five;", + "\xEF\xBB\xBF" /* UTF-8 BOM */, NULL, 0}, # ifdef XML_DTD - /* Parameter entities */ - {"\">\n" - "%comment;\n" - "]>\n" - "", - NULL, NULL, sizeof(XML_Char) * strlen("")}, - {"\n" - "%ninedef;\n" - "]>\n" - "&nine;", - NULL, NULL, - sizeof(XML_Char) - * (strlen("") + strlen("123456789"))}, - {"\">\n" - "%comment;\">\n" - "%comment2;\n" - "]>\n" - "\n", - NULL, NULL, - sizeof(XML_Char) - * (strlen("%comment;%comment;") + 2 * strlen(""))}, - {"\n" - " \n" - " %five2def;\n" - "]>\n" - "&five2;", - NULL, NULL, /* from "%five2def;": */ - sizeof(XML_Char) - * (strlen("") - + 2 /* calls to "%five;" */ * strlen("12345") - + /* from "&five2;": */ strlen("[12345][12345]]]]"))}, - {"\n" - "", - "'>\n" - "%comment;%comment;'>\n" - "%comment2;", - NULL, - sizeof(XML_Char) - * (strlen("%comment;%comment;") - + 2 /* calls to "%comment;" */ * strlen(""))}, - {"\n" - "", - "\n" - "%e1;'>\n" - "%e2;\n", - "", sizeof(XML_Char) * strlen("")}, - { - "\n" - "", - "\n" - "", - "\n" - "hello\n" - "xml" /* without trailing newline! */, - 0, - }, - { - "\n" - "", - "\n" - "", - "\n" - "hello\n" - "xml\n" /* with trailing newline! */, - 0, - }, - {"\n" - "\n", - "\n" - "\n" - "\n" - "%e1;\n", - "\xEF\xBB\xBF" /* UTF-8 BOM */, - strlen("\xEF\xBB\xBF")}, + /* Parameter entities */ + {"\">\n" + "%comment;\n" + "]>\n" + "", + NULL, NULL, sizeof(XML_Char) * strlen("")}, + {"\n" + "%ninedef;\n" + "]>\n" + "&nine;", + NULL, NULL, + sizeof(XML_Char) + * (strlen("") + strlen("123456789"))}, + {"\">\n" + "%comment;\">\n" + "%comment2;\n" + "]>\n" + "\n", + NULL, NULL, + sizeof(XML_Char) + * (strlen("%comment;%comment;") + 2 * strlen(""))}, + {"\n" + " \n" + " %five2def;\n" + "]>\n" + "&five2;", + NULL, NULL, /* from "%five2def;": */ + sizeof(XML_Char) + * (strlen("") + + 2 /* calls to "%five;" */ * strlen("12345") + + /* from "&five2;": */ strlen("[12345][12345]]]]"))}, + {"\n" + "", + "'>\n" + "%comment;%comment;'>\n" + "%comment2;", + NULL, + sizeof(XML_Char) + * (strlen("%comment;%comment;") + + 2 /* calls to "%comment;" */ * strlen(""))}, + {"\n" + "", + "\n" + "%e1;'>\n" + "%e2;\n", + "", sizeof(XML_Char) * strlen("")}, + { + "\n" + "", + "\n" + "", + "\n" + "hello\n" + "xml" /* without trailing newline! */, + 0, + }, + { + "\n" + "", + "\n" + "", + "\n" + "hello\n" + "xml\n" /* with trailing newline! */, + 0, + }, + {"\n" + "\n", + "\n" + "\n" + "\n" + "%e1;\n", + "\xEF\xBB\xBF" /* UTF-8 BOM */, + strlen("\xEF\xBB\xBF")}, # endif /* XML_DTD */ };