current/SOURCES/CVE-2022-25236-2.patch

From 2de077423fb22750ebea599677d523b53cb93b1d Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Sat, 12 Feb 2022 00:51:43 +0100
Subject: [PATCH] tests: Cover CVE-2022-25236

---
 expat/tests/runtests.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -7304,6 +7304,35 @@ START_TEST(test_ns_double_colon_doctype)
 }
 END_TEST
 
+START_TEST(test_ns_separator_in_uri) {
+  struct test_case {
+    enum XML_Status expectedStatus;
+    const char *doc;
+  };
+  struct test_case cases[] = {
+      {XML_STATUS_OK, "<doc xmlns='one_two' />"},
+      {XML_STATUS_ERROR, "<doc xmlns='one&#x0A;two' />"},
+  };
+
+  size_t i = 0;
+  size_t failCount = 0;
+  for (; i < sizeof(cases) / sizeof(cases[0]); i++) {
+    XML_Parser parser = XML_ParserCreateNS(NULL, '\n');
+    XML_SetElementHandler(parser, dummy_start_element, dummy_end_element);
+    if (XML_Parse(parser, cases[i].doc, (int)strlen(cases[i].doc),
+                  /*isFinal*/ XML_TRUE)
+        != cases[i].expectedStatus) {
+      failCount++;
+    }
+    XML_ParserFree(parser);
+  }
+
+  if (failCount) {
+    fail("Namespace separator handling is broken");
+  }
+}
+END_TEST
+
 /* Control variable; the number of times duff_allocator() will successfully
  * allocate */
 #define ALLOC_ALWAYS_SUCCEED (-1)
@@ -11598,6 +11627,7 @@ make_suite(void) {
   tcase_add_test(tc_namespace, test_ns_utf16_doctype);
   tcase_add_test(tc_namespace, test_ns_invalid_doctype);
   tcase_add_test(tc_namespace, test_ns_double_colon_doctype);
+  tcase_add_test(tc_namespace, test_ns_separator_in_uri);
 
   suite_add_tcase(s, tc_misc);
   tcase_add_checked_fixture(tc_misc, NULL, basic_teardown);
1	From 2de077423fb22750ebea599677d523b53cb93b1d Mon Sep 17 00:00:00 2001
2	From: Sebastian Pipping <sebastian@pipping.org>
3	Date: Sat, 12 Feb 2022 00:51:43 +0100
4	Subject: [PATCH] tests: Cover CVE-2022-25236
5
6	---
7	expat/tests/runtests.c \| 30 ++++++++++++++++++++++++++++++
8	1 file changed, 30 insertions(+)
9
10	--- a/tests/runtests.c
11	+++ b/tests/runtests.c
12	@@ -7304,6 +7304,35 @@ START_TEST(test_ns_double_colon_doctype)
13	}
14	END_TEST
15
16	+START_TEST(test_ns_separator_in_uri) {
17	+ struct test_case {
18	+ enum XML_Status expectedStatus;
19	+ const char *doc;
20	+ };
21	+ struct test_case cases[] = {
22	+ {XML_STATUS_OK, "<doc xmlns='one_two' />"},
23	+ {XML_STATUS_ERROR, "<doc xmlns='one two' />"},
24	+ };
25	+
26	+ size_t i = 0;
27	+ size_t failCount = 0;
28	+ for (; i < sizeof(cases) / sizeof(cases[0]); i++) {
29	+ XML_Parser parser = XML_ParserCreateNS(NULL, '\n');
30	+ XML_SetElementHandler(parser, dummy_start_element, dummy_end_element);
31	+ if (XML_Parse(parser, cases[i].doc, (int)strlen(cases[i].doc),
32	+ /isFinal/ XML_TRUE)
33	+ != cases[i].expectedStatus) {
34	+ failCount++;
35	+ }
36	+ XML_ParserFree(parser);
37	+ }
38	+
39	+ if (failCount) {
40	+ fail("Namespace separator handling is broken");
41	+ }
42	+}
43	+END_TEST
44	+
45	/* Control variable; the number of times duff_allocator() will successfully
46	* allocate */
47	#define ALLOC_ALWAYS_SUCCEED (-1)
48	@@ -11598,6 +11627,7 @@ make_suite(void) {
49	tcase_add_test(tc_namespace, test_ns_utf16_doctype);
50	tcase_add_test(tc_namespace, test_ns_invalid_doctype);
51	tcase_add_test(tc_namespace, test_ns_double_colon_doctype);
52	+ tcase_add_test(tc_namespace, test_ns_separator_in_uri);
53
54	suite_add_tcase(s, tc_misc);
55	tcase_add_checked_fixture(tc_misc, NULL, basic_teardown);