rpm/python310
SHA256
1
0
Fork 0
forked from pool/python310
Code Pull Requests Activity

Adjust support-expat-CVE-2022-25236-patched.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=43
This commit is contained in:
Matej Cepl 2022-06-15 04:51:16 +00:00 committed by Git OBS Bridge
parent 140fcc45f7
commit 7760f38ab4
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
support-expat-CVE-2022-25236-patched.patch
View File

@ -23,27 +23,53 @@ Also, test_minidom.py: Support Expat >=2.4.5
Co-authored-by: Sebastian Pipping <sebastian@pipping.org> Co-authored-by: Sebastian Pipping <sebastian@pipping.org>
--- ---
Lib/test/test_minidom.py | 4 ++-- Lib/test/test_minidom.py | 25 ++++++++++---------------
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 10 insertions(+), 15 deletions(-)
create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst
--- a/Lib/test/test_minidom.py --- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py +++ b/Lib/test/test_minidom.py
@@ -1149,7 +1149,7 @@ class MinidomTest(unittest.TestCase): @@ -6,7 +6,6 @@ import io
from test import support
import unittest
-import pyexpat
import xml.dom.minidom
from xml.dom.minidom import parse, Node, Document, parseString
@@ -1149,13 +1148,11 @@ class MinidomTest(unittest.TestCase):
# Verify that character decoding errors raise exceptions instead # Verify that character decoding errors raise exceptions instead
# of crashing # of crashing
- if pyexpat.version_info >= (2, 4, 5): - if pyexpat.version_info >= (2, 4, 5):
+ if pyexpat.version_info >= (2, 4, 4): - self.assertRaises(ExpatError, parseString,
self.assertRaises(ExpatError, parseString, - b'<fran\xe7ais></fran\xe7ais>')
b'<fran\xe7ais></fran\xe7ais>') - self.assertRaises(ExpatError, parseString,
self.assertRaises(ExpatError, parseString, - b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>')
@@ -1617,7 +1617,7 @@ class MinidomTest(unittest.TestCase): - else:
- self.assertRaises(UnicodeDecodeError, parseString,
+ # It doesn’t make any sense to insist on the exact text of the
+ # error message, or even the exact Exception … it is enough that
+ # the error has been discovered.
+ with self.assertRaises((UnicodeDecodeError, ExpatError)):
+ parseString(
b'<fran\xe7ais>Comment \xe7a va ? Tr\xe8s bien ?</fran\xe7ais>')
doc.unlink()
@@ -1617,12 +1614,10 @@ class MinidomTest(unittest.TestCase):
self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE) self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE)
def testExceptionOnSpacesInXMLNSValue(self): def testExceptionOnSpacesInXMLNSValue(self):
- if pyexpat.version_info >= (2, 4, 5): - if pyexpat.version_info >= (2, 4, 5):
+ if pyexpat.version_info >= (2, 4, 4): - context = self.assertRaisesRegex(ExpatError, 'syntax error')
context = self.assertRaisesRegex(ExpatError, 'syntax error') - else:
else: - context = self.assertRaisesRegex(ValueError, 'Unsupported syntax')
context = self.assertRaisesRegex(ValueError, 'Unsupported syntax') -
- with context:
+ # It doesn’t make any sense to insist on the exact text of the
+ # error message, or even the exact Exception … it is enough that
+ # the error has been discovered.
+ with self.assertRaises((ExpatError, ValueError)):
parseString('<element xmlns:abc="http:abc.com/de f g/hi/j k"><abc:foo /></element>')
def testDocRemoveChild(self):