From 730e031b5a563eb164d9d43b1eab72584cbf6215803564f91978bfd6f0409f9c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 18 May 2025 22:42:21 +0000 Subject: [PATCH] Fix patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python312?expand=0&rev=129 --- CVE-2025-4516-DecodeError-handler.patch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CVE-2025-4516-DecodeError-handler.patch b/CVE-2025-4516-DecodeError-handler.patch index da45492..4d79e4d 100644 --- a/CVE-2025-4516-DecodeError-handler.patch +++ b/CVE-2025-4516-DecodeError-handler.patch @@ -72,7 +72,7 @@ Index: Python-3.12.10/Include/internal/pycore_unicodeobject.h Index: Python-3.12.10/Lib/test/test_codeccallbacks.py =================================================================== --- Python-3.12.10.orig/Lib/test/test_codeccallbacks.py 2025-05-17 12:00:00.337816215 +0000 -+++ Python-3.12.10/Lib/test/test_codeccallbacks.py 2025-05-18 22:21:59.492260851 +0000 ++++ Python-3.12.10/Lib/test/test_codeccallbacks.py 2025-05-18 22:41:55.726670925 +0000 @@ -1,6 +1,7 @@ import codecs import html.entities @@ -116,19 +116,19 @@ Index: Python-3.12.10/Lib/test/test_codeccallbacks.py + self.assertIn(msg, str(cm.warning)) + + check(br'\x0n\z', '\u0404\n\\z', r"invalid escape sequence") -+ check(br'\x0n\501', '\u0404\n\u0141', r'"\501" is an invalid octal escape sequence') -+ check(br'\x0z', '\u0404\\z', r'"\z" is an invalid escape sequence') ++ check(br'\x0n\501', '\u0404\n\u0141', r'invalid octal escape sequence') ++ check(br'\x0z', '\u0404\\z', r'invalid escape sequence') + -+ check(br'\x3n\zr', '\u0404\n\\zr', r'"\z" is an invalid escape sequence') -+ check(br'\x3zr', '\u0404\\zr', r'"\z" is an invalid escape sequence') -+ check(br'\x3z5', '\u0404\\z5', r'"\z" is an invalid escape sequence') -+ check(memoryview(br'\x3z5x')[:-1], '\u0404\\z5', r'"\z" is an invalid escape sequence') -+ check(memoryview(br'\x3z5xy')[:-2], '\u0404\\z5', r'"\z" is an invalid escape sequence') ++ check(br'\x3n\zr', '\u0404\n\\zr', r'invalid escape sequence') ++ check(br'\x3zr', '\u0404\\zr', r'invalid escape sequence') ++ check(br'\x3z5', '\u0404\\z5', r'invalid escape sequence') ++ check(memoryview(br'\x3z5x')[:-1], '\u0404\\z5', r'invalid escape sequence') ++ check(memoryview(br'\x3z5xy')[:-2], '\u0404\\z5', r'invalid escape sequence') + -+ check(br'\x5n\z', '\u0404\n\\z', r'"\z" is an invalid escape sequence') -+ check(br'\x5n\501', '\u0404\n\u0141', r'"\501" is an invalid octal escape sequence') -+ check(br'\x5z', '\u0404\\z', r'"\z" is an invalid escape sequence') -+ check(memoryview(br'\x5zy')[:-1], '\u0404\\z', r'"\z" is an invalid escape sequence') ++ check(br'\x5n\z', '\u0404\n\\z', r'invalid escape sequence') ++ check(br'\x5n\501', '\u0404\n\u0141', r'invalid octal escape sequence') ++ check(br'\x5z', '\u0404\\z', r'invalid escape sequence') ++ check(memoryview(br'\x5zy')[:-1], '\u0404\\z', r'invalid escape sequence') + # issue32583 def test_crashing_decode_handler(self):