forked from pool/python312
Accepting request 1284283 from devel:languages:python:Factory
- Update to 3.12.11:
- Security
- gh-135034: Fixes multiple issues that allowed tarfile
extraction filters (filter="data" and filter="tar") to be
bypassed using crafted symlinks and hard links.
Addresses CVE-2024-12718 (bsc#1244056), CVE-2025-4138
(bsc#1244059), CVE-2025-4330 (bsc#1244060), and
CVE-2025-4517 (bsc#1244032).
- gh-133767: Fix use-after-free in the “unicode-escape”
decoder with a non-“strict” error handler (CVE-2025-4516,
bsc#1243273).
- gh-128840: Short-circuit the processing of long IPv6
addresses early in ipaddress to prevent excessive memory
consumption and a minor denial-of-service.
- Library
- gh-128840: Fix parsing long IPv6 addresses with embedded
IPv4 address.
- gh-134062: ipaddress: fix collisions in __hash__() for
IPv4Network and IPv6Network objects.
- gh-123409: Fix ipaddress.IPv6Address.reverse_pointer output
according to RFC 3596, §2.5. Patch by Bénédikt Tran.
- bpo-43633: Improve the textual representation of
IPv4-mapped IPv6 addresses (RFC 4291 Sections 2.2, 2.5.5.2)
in ipaddress. Patch by Oleksandr Pavliuk.
- Remove upstreamed patches:
- CVE-2025-4516-DecodeError-handler.patch
- restrict PEP668 to ALP/Tumbleweed
* Support Expat >= 2.4.5
- allow build with Sphinx >= 3.x
OBS-URL: https://build.opensuse.org/request/show/1284283
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python312?expand=0&rev=34
This commit is contained in:
@@ -1,520 +0,0 @@
|
|||||||
From a75953b347716fff694aa59a7c7c2489fa50d1f5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Serhiy Storchaka <storchaka@gmail.com>
|
|
||||||
Date: Tue, 20 May 2025 15:46:57 +0300
|
|
||||||
Subject: [PATCH] [3.12] gh-133767: Fix use-after-free in the unicode-escape
|
|
||||||
decoder with an error handler (GH-129648) (GH-133944)
|
|
||||||
|
|
||||||
If the error handler is used, a new bytes object is created to set as
|
|
||||||
the object attribute of UnicodeDecodeError, and that bytes object then
|
|
||||||
replaces the original data. A pointer to the decoded data will became invalid
|
|
||||||
after destroying that temporary bytes object. So we need other way to return
|
|
||||||
the first invalid escape from _PyUnicode_DecodeUnicodeEscapeInternal().
|
|
||||||
|
|
||||||
_PyBytes_DecodeEscape() does not have such issue, because it does not
|
|
||||||
use the error handlers registry, but it should be changed for compatibility
|
|
||||||
with _PyUnicode_DecodeUnicodeEscapeInternal().
|
|
||||||
(cherry picked from commit 9f69a58623bd01349a18ba0c7a9cb1dad6a51e8e)
|
|
||||||
(cherry picked from commit 6279eb8c076d89d3739a6edb393e43c7929b429d)
|
|
||||||
|
|
||||||
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
|
|
||||||
---
|
|
||||||
Include/cpython/bytesobject.h | 4
|
|
||||||
Include/cpython/unicodeobject.h | 13 ++
|
|
||||||
Lib/test/test_codeccallbacks.py | 39 ++++++
|
|
||||||
Lib/test/test_codecs.py | 52 ++++++--
|
|
||||||
Misc/NEWS.d/next/Security/2025-05-09-20-22-54.gh-issue-133767.kN2i3Q.rst | 2
|
|
||||||
Objects/bytesobject.c | 54 +++++---
|
|
||||||
Objects/unicodeobject.c | 61 +++++++---
|
|
||||||
Parser/string_parser.c | 26 ++--
|
|
||||||
8 files changed, 194 insertions(+), 57 deletions(-)
|
|
||||||
create mode 100644 Misc/NEWS.d/next/Security/2025-05-09-20-22-54.gh-issue-133767.kN2i3Q.rst
|
|
||||||
|
|
||||||
Index: Python-3.12.10/Include/cpython/bytesobject.h
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Include/cpython/bytesobject.h 2025-04-08 11:35:47.000000000 +0000
|
|
||||||
+++ Python-3.12.10/Include/cpython/bytesobject.h 2025-05-22 12:38:07.205729906 +0000
|
|
||||||
@@ -25,6 +25,10 @@
|
|
||||||
int use_bytearray);
|
|
||||||
|
|
||||||
/* Helper for PyBytes_DecodeEscape that detects invalid escape chars. */
|
|
||||||
+PyAPI_FUNC(PyObject*) _PyBytes_DecodeEscape2(const char *, Py_ssize_t,
|
|
||||||
+ const char *,
|
|
||||||
+ int *, const char **);
|
|
||||||
+// Export for binary compatibility.
|
|
||||||
PyAPI_FUNC(PyObject *) _PyBytes_DecodeEscape(const char *, Py_ssize_t,
|
|
||||||
const char *, const char **);
|
|
||||||
|
|
||||||
Index: Python-3.12.10/Include/cpython/unicodeobject.h
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Include/cpython/unicodeobject.h 2025-04-08 11:35:47.000000000 +0000
|
|
||||||
+++ Python-3.12.10/Include/cpython/unicodeobject.h 2025-05-22 12:38:07.205905378 +0000
|
|
||||||
@@ -684,6 +684,19 @@
|
|
||||||
);
|
|
||||||
/* Helper for PyUnicode_DecodeUnicodeEscape that detects invalid escape
|
|
||||||
chars. */
|
|
||||||
+PyAPI_FUNC(PyObject*) _PyUnicode_DecodeUnicodeEscapeInternal2(
|
|
||||||
+ const char *string, /* Unicode-Escape encoded string */
|
|
||||||
+ Py_ssize_t length, /* size of string */
|
|
||||||
+ const char *errors, /* error handling */
|
|
||||||
+ Py_ssize_t *consumed, /* bytes consumed */
|
|
||||||
+ int *first_invalid_escape_char, /* on return, if not -1, contain the first
|
|
||||||
+ invalid escaped char (<= 0xff) or invalid
|
|
||||||
+ octal escape (> 0xff) in string. */
|
|
||||||
+ const char **first_invalid_escape_ptr); /* on return, if not NULL, may
|
|
||||||
+ point to the first invalid escaped
|
|
||||||
+ char in string.
|
|
||||||
+ May be NULL if errors is not NULL. */
|
|
||||||
+// Export for binary compatibility.
|
|
||||||
PyAPI_FUNC(PyObject*) _PyUnicode_DecodeUnicodeEscapeInternal(
|
|
||||||
const char *string, /* Unicode-Escape encoded string */
|
|
||||||
Py_ssize_t length, /* size of string */
|
|
||||||
Index: Python-3.12.10/Lib/test/test_codeccallbacks.py
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Lib/test/test_codeccallbacks.py 2025-05-22 12:37:58.935377659 +0000
|
|
||||||
+++ Python-3.12.10/Lib/test/test_codeccallbacks.py 2025-05-22 12:38:07.206131787 +0000
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
import codecs
|
|
||||||
import html.entities
|
|
||||||
import itertools
|
|
||||||
+import re
|
|
||||||
import sys
|
|
||||||
import unicodedata
|
|
||||||
import unittest
|
|
||||||
@@ -1124,7 +1125,7 @@
|
|
||||||
text = 'abc<def>ghi'*n
|
|
||||||
text.translate(charmap)
|
|
||||||
|
|
||||||
- def test_mutatingdecodehandler(self):
|
|
||||||
+ def test_mutating_decode_handler(self):
|
|
||||||
baddata = [
|
|
||||||
("ascii", b"\xff"),
|
|
||||||
("utf-7", b"++"),
|
|
||||||
@@ -1159,6 +1160,42 @@
|
|
||||||
for (encoding, data) in baddata:
|
|
||||||
self.assertEqual(data.decode(encoding, "test.mutating"), "\u4242")
|
|
||||||
|
|
||||||
+ def test_mutating_decode_handler_unicode_escape(self):
|
|
||||||
+ decode = codecs.unicode_escape_decode
|
|
||||||
+ def mutating(exc):
|
|
||||||
+ if isinstance(exc, UnicodeDecodeError):
|
|
||||||
+ r = data.get(exc.object[:exc.end])
|
|
||||||
+ if r is not None:
|
|
||||||
+ exc.object = r[0] + exc.object[exc.end:]
|
|
||||||
+ return ('\u0404', r[1])
|
|
||||||
+ raise AssertionError("don't know how to handle %r" % exc)
|
|
||||||
+
|
|
||||||
+ codecs.register_error('test.mutating2', mutating)
|
|
||||||
+ data = {
|
|
||||||
+ br'\x0': (b'\\', 0),
|
|
||||||
+ br'\x3': (b'xxx\\', 3),
|
|
||||||
+ br'\x5': (b'x\\', 1),
|
|
||||||
+ }
|
|
||||||
+ def check(input, expected, msg):
|
|
||||||
+ with self.assertWarns(DeprecationWarning) as cm:
|
|
||||||
+ self.assertEqual(decode(input, 'test.mutating2'), (expected, len(input)))
|
|
||||||
+ self.assertIn(msg, str(cm.warning))
|
|
||||||
+
|
|
||||||
+ check(br'\x0n\z', '\u0404\n\\z', r"invalid escape sequence '\z'")
|
|
||||||
+ check(br'\x0n\501', '\u0404\n\u0141', r"invalid octal escape sequence '\501'")
|
|
||||||
+ check(br'\x0z', '\u0404\\z', r"invalid escape sequence '\z'")
|
|
||||||
+
|
|
||||||
+ check(br'\x3n\zr', '\u0404\n\\zr', r"invalid escape sequence '\z'")
|
|
||||||
+ check(br'\x3zr', '\u0404\\zr', r"invalid escape sequence '\z'")
|
|
||||||
+ check(br'\x3z5', '\u0404\\z5', r"invalid escape sequence '\z'")
|
|
||||||
+ check(memoryview(br'\x3z5x')[:-1], '\u0404\\z5', r"invalid escape sequence '\z'")
|
|
||||||
+ check(memoryview(br'\x3z5xy')[:-2], '\u0404\\z5', r"invalid escape sequence '\z'")
|
|
||||||
+
|
|
||||||
+ check(br'\x5n\z', '\u0404\n\\z', r"invalid escape sequence '\z'")
|
|
||||||
+ check(br'\x5n\501', '\u0404\n\u0141', r"invalid octal escape sequence '\501'")
|
|
||||||
+ check(br'\x5z', '\u0404\\z', r"invalid escape sequence '\z'")
|
|
||||||
+ check(memoryview(br'\x5zy')[:-1], '\u0404\\z', r"invalid escape sequence '\z'")
|
|
||||||
+
|
|
||||||
# issue32583
|
|
||||||
def test_crashing_decode_handler(self):
|
|
||||||
# better generating one more character to fill the extra space slot
|
|
||||||
Index: Python-3.12.10/Lib/test/test_codecs.py
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Lib/test/test_codecs.py 2025-05-22 12:37:58.952566393 +0000
|
|
||||||
+++ Python-3.12.10/Lib/test/test_codecs.py 2025-05-22 12:38:07.206633606 +0000
|
|
||||||
@@ -1196,23 +1196,39 @@
|
|
||||||
check(br"[\1010]", b"[A0]")
|
|
||||||
check(br"[\x41]", b"[A]")
|
|
||||||
check(br"[\x410]", b"[A0]")
|
|
||||||
+
|
|
||||||
+ def test_warnings(self):
|
|
||||||
+ decode = codecs.escape_decode
|
|
||||||
+ check = coding_checker(self, decode)
|
|
||||||
for i in range(97, 123):
|
|
||||||
b = bytes([i])
|
|
||||||
if b not in b'abfnrtvx':
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\%c'" % i):
|
|
||||||
check(b"\\" + b, b"\\" + b)
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\%c'" % (i-32)):
|
|
||||||
check(b"\\" + b.upper(), b"\\" + b.upper())
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\8'"):
|
|
||||||
check(br"\8", b"\\8")
|
|
||||||
with self.assertWarns(DeprecationWarning):
|
|
||||||
check(br"\9", b"\\9")
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\\xfa'") as cm:
|
|
||||||
check(b"\\\xfa", b"\\\xfa")
|
|
||||||
for i in range(0o400, 0o1000):
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid octal escape sequence '\\%o'" % i):
|
|
||||||
check(rb'\%o' % i, bytes([i & 0o377]))
|
|
||||||
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\z'"):
|
|
||||||
+ self.assertEqual(decode(br'\x\z', 'ignore'), (b'\\z', 4))
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid octal escape sequence '\\501'"):
|
|
||||||
+ self.assertEqual(decode(br'\x\501', 'ignore'), (b'A', 6))
|
|
||||||
+
|
|
||||||
def test_errors(self):
|
|
||||||
decode = codecs.escape_decode
|
|
||||||
self.assertRaises(ValueError, decode, br"\x")
|
|
||||||
@@ -2479,24 +2495,40 @@
|
|
||||||
check(br"[\x410]", "[A0]")
|
|
||||||
check(br"\u20ac", "\u20ac")
|
|
||||||
check(br"\U0001d120", "\U0001d120")
|
|
||||||
+
|
|
||||||
+ def test_decode_warnings(self):
|
|
||||||
+ decode = codecs.unicode_escape_decode
|
|
||||||
+ check = coding_checker(self, decode)
|
|
||||||
for i in range(97, 123):
|
|
||||||
b = bytes([i])
|
|
||||||
if b not in b'abfnrtuvx':
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\%c'" % i):
|
|
||||||
check(b"\\" + b, "\\" + chr(i))
|
|
||||||
if b.upper() not in b'UN':
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\%c'" % (i-32)):
|
|
||||||
check(b"\\" + b.upper(), "\\" + chr(i-32))
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\8'"):
|
|
||||||
check(br"\8", "\\8")
|
|
||||||
with self.assertWarns(DeprecationWarning):
|
|
||||||
check(br"\9", "\\9")
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\\xfa'") as cm:
|
|
||||||
check(b"\\\xfa", "\\\xfa")
|
|
||||||
for i in range(0o400, 0o1000):
|
|
||||||
- with self.assertWarns(DeprecationWarning):
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid octal escape sequence '\\%o'" % i):
|
|
||||||
check(rb'\%o' % i, chr(i))
|
|
||||||
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid escape sequence '\\z'"):
|
|
||||||
+ self.assertEqual(decode(br'\x\z', 'ignore'), ('\\z', 4))
|
|
||||||
+ with self.assertWarnsRegex(DeprecationWarning,
|
|
||||||
+ r"invalid octal escape sequence '\\501'"):
|
|
||||||
+ self.assertEqual(decode(br'\x\501', 'ignore'), ('\u0141', 6))
|
|
||||||
+
|
|
||||||
def test_decode_errors(self):
|
|
||||||
decode = codecs.unicode_escape_decode
|
|
||||||
for c, d in (b'x', 2), (b'u', 4), (b'U', 4):
|
|
||||||
Index: Python-3.12.10/Misc/NEWS.d/next/Security/2025-05-09-20-22-54.gh-issue-133767.kN2i3Q.rst
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
||||||
+++ Python-3.12.10/Misc/NEWS.d/next/Security/2025-05-09-20-22-54.gh-issue-133767.kN2i3Q.rst 2025-05-22 12:38:07.207057599 +0000
|
|
||||||
@@ -0,0 +1,2 @@
|
|
||||||
+Fix use-after-free in the "unicode-escape" decoder with a non-"strict" error
|
|
||||||
+handler.
|
|
||||||
Index: Python-3.12.10/Objects/bytesobject.c
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Objects/bytesobject.c 2025-04-08 11:35:47.000000000 +0000
|
|
||||||
+++ Python-3.12.10/Objects/bytesobject.c 2025-05-22 12:38:07.207534041 +0000
|
|
||||||
@@ -1048,10 +1048,11 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Unescape a backslash-escaped string. */
|
|
||||||
-PyObject *_PyBytes_DecodeEscape(const char *s,
|
|
||||||
+PyObject *_PyBytes_DecodeEscape2(const char *s,
|
|
||||||
Py_ssize_t len,
|
|
||||||
const char *errors,
|
|
||||||
- const char **first_invalid_escape)
|
|
||||||
+ int *first_invalid_escape_char,
|
|
||||||
+ const char **first_invalid_escape_ptr)
|
|
||||||
{
|
|
||||||
int c;
|
|
||||||
char *p;
|
|
||||||
@@ -1065,7 +1066,8 @@
|
|
||||||
return NULL;
|
|
||||||
writer.overallocate = 1;
|
|
||||||
|
|
||||||
- *first_invalid_escape = NULL;
|
|
||||||
+ *first_invalid_escape_char = -1;
|
|
||||||
+ *first_invalid_escape_ptr = NULL;
|
|
||||||
|
|
||||||
end = s + len;
|
|
||||||
while (s < end) {
|
|
||||||
@@ -1103,9 +1105,10 @@
|
|
||||||
c = (c<<3) + *s++ - '0';
|
|
||||||
}
|
|
||||||
if (c > 0377) {
|
|
||||||
- if (*first_invalid_escape == NULL) {
|
|
||||||
- *first_invalid_escape = s-3; /* Back up 3 chars, since we've
|
|
||||||
- already incremented s. */
|
|
||||||
+ if (*first_invalid_escape_char == -1) {
|
|
||||||
+ *first_invalid_escape_char = c;
|
|
||||||
+ /* Back up 3 chars, since we've already incremented s. */
|
|
||||||
+ *first_invalid_escape_ptr = s - 3;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*p++ = c;
|
|
||||||
@@ -1146,9 +1149,10 @@
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
- if (*first_invalid_escape == NULL) {
|
|
||||||
- *first_invalid_escape = s-1; /* Back up one char, since we've
|
|
||||||
- already incremented s. */
|
|
||||||
+ if (*first_invalid_escape_char == -1) {
|
|
||||||
+ *first_invalid_escape_char = (unsigned char)s[-1];
|
|
||||||
+ /* Back up one char, since we've already incremented s. */
|
|
||||||
+ *first_invalid_escape_ptr = s - 1;
|
|
||||||
}
|
|
||||||
*p++ = '\\';
|
|
||||||
s--;
|
|
||||||
@@ -1162,23 +1166,37 @@
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+// Export for binary compatibility.
|
|
||||||
+PyObject *_PyBytes_DecodeEscape(const char *s,
|
|
||||||
+ Py_ssize_t len,
|
|
||||||
+ const char *errors,
|
|
||||||
+ const char **first_invalid_escape)
|
|
||||||
+{
|
|
||||||
+ int first_invalid_escape_char;
|
|
||||||
+ return _PyBytes_DecodeEscape2(
|
|
||||||
+ s, len, errors,
|
|
||||||
+ &first_invalid_escape_char,
|
|
||||||
+ first_invalid_escape);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
PyObject *PyBytes_DecodeEscape(const char *s,
|
|
||||||
Py_ssize_t len,
|
|
||||||
const char *errors,
|
|
||||||
Py_ssize_t Py_UNUSED(unicode),
|
|
||||||
const char *Py_UNUSED(recode_encoding))
|
|
||||||
{
|
|
||||||
- const char* first_invalid_escape;
|
|
||||||
- PyObject *result = _PyBytes_DecodeEscape(s, len, errors,
|
|
||||||
- &first_invalid_escape);
|
|
||||||
+ int first_invalid_escape_char;
|
|
||||||
+ const char *first_invalid_escape_ptr;
|
|
||||||
+ PyObject *result = _PyBytes_DecodeEscape2(s, len, errors,
|
|
||||||
+ &first_invalid_escape_char,
|
|
||||||
+ &first_invalid_escape_ptr);
|
|
||||||
if (result == NULL)
|
|
||||||
return NULL;
|
|
||||||
- if (first_invalid_escape != NULL) {
|
|
||||||
- unsigned char c = *first_invalid_escape;
|
|
||||||
- if ('4' <= c && c <= '7') {
|
|
||||||
+ if (first_invalid_escape_char != -1) {
|
|
||||||
+ if (first_invalid_escape_char > 0xff) {
|
|
||||||
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
|
|
||||||
- "invalid octal escape sequence '\\%.3s'",
|
|
||||||
- first_invalid_escape) < 0)
|
|
||||||
+ "invalid octal escape sequence '\\%o'",
|
|
||||||
+ first_invalid_escape_char) < 0)
|
|
||||||
{
|
|
||||||
Py_DECREF(result);
|
|
||||||
return NULL;
|
|
||||||
@@ -1187,7 +1205,7 @@
|
|
||||||
else {
|
|
||||||
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
|
|
||||||
"invalid escape sequence '\\%c'",
|
|
||||||
- c) < 0)
|
|
||||||
+ first_invalid_escape_char) < 0)
|
|
||||||
{
|
|
||||||
Py_DECREF(result);
|
|
||||||
return NULL;
|
|
||||||
Index: Python-3.12.10/Objects/unicodeobject.c
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Objects/unicodeobject.c 2025-04-08 11:35:47.000000000 +0000
|
|
||||||
+++ Python-3.12.10/Objects/unicodeobject.c 2025-05-22 12:38:07.209060814 +0000
|
|
||||||
@@ -6046,13 +6046,15 @@
|
|
||||||
/* --- Unicode Escape Codec ----------------------------------------------- */
|
|
||||||
|
|
||||||
PyObject *
|
|
||||||
-_PyUnicode_DecodeUnicodeEscapeInternal(const char *s,
|
|
||||||
+_PyUnicode_DecodeUnicodeEscapeInternal2(const char *s,
|
|
||||||
Py_ssize_t size,
|
|
||||||
const char *errors,
|
|
||||||
Py_ssize_t *consumed,
|
|
||||||
- const char **first_invalid_escape)
|
|
||||||
+ int *first_invalid_escape_char,
|
|
||||||
+ const char **first_invalid_escape_ptr)
|
|
||||||
{
|
|
||||||
const char *starts = s;
|
|
||||||
+ const char *initial_starts = starts;
|
|
||||||
_PyUnicodeWriter writer;
|
|
||||||
const char *end;
|
|
||||||
PyObject *errorHandler = NULL;
|
|
||||||
@@ -6061,7 +6063,8 @@
|
|
||||||
PyInterpreterState *interp = _PyInterpreterState_Get();
|
|
||||||
|
|
||||||
// so we can remember if we've seen an invalid escape char or not
|
|
||||||
- *first_invalid_escape = NULL;
|
|
||||||
+ *first_invalid_escape_char = -1;
|
|
||||||
+ *first_invalid_escape_ptr = NULL;
|
|
||||||
|
|
||||||
if (size == 0) {
|
|
||||||
if (consumed) {
|
|
||||||
@@ -6149,9 +6152,12 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ch > 0377) {
|
|
||||||
- if (*first_invalid_escape == NULL) {
|
|
||||||
- *first_invalid_escape = s-3; /* Back up 3 chars, since we've
|
|
||||||
- already incremented s. */
|
|
||||||
+ if (*first_invalid_escape_char == -1) {
|
|
||||||
+ *first_invalid_escape_char = ch;
|
|
||||||
+ if (starts == initial_starts) {
|
|
||||||
+ /* Back up 3 chars, since we've already incremented s. */
|
|
||||||
+ *first_invalid_escape_ptr = s - 3;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
WRITE_CHAR(ch);
|
|
||||||
@@ -6252,9 +6258,12 @@
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
default:
|
|
||||||
- if (*first_invalid_escape == NULL) {
|
|
||||||
- *first_invalid_escape = s-1; /* Back up one char, since we've
|
|
||||||
- already incremented s. */
|
|
||||||
+ if (*first_invalid_escape_char == -1) {
|
|
||||||
+ *first_invalid_escape_char = c;
|
|
||||||
+ if (starts == initial_starts) {
|
|
||||||
+ /* Back up one char, since we've already incremented s. */
|
|
||||||
+ *first_invalid_escape_ptr = s - 1;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
WRITE_ASCII_CHAR('\\');
|
|
||||||
WRITE_CHAR(c);
|
|
||||||
@@ -6293,24 +6302,40 @@
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+// Export for binary compatibility.
|
|
||||||
+PyObject *
|
|
||||||
+_PyUnicode_DecodeUnicodeEscapeInternal(const char *s,
|
|
||||||
+ Py_ssize_t size,
|
|
||||||
+ const char *errors,
|
|
||||||
+ Py_ssize_t *consumed,
|
|
||||||
+ const char **first_invalid_escape)
|
|
||||||
+{
|
|
||||||
+ int first_invalid_escape_char;
|
|
||||||
+ return _PyUnicode_DecodeUnicodeEscapeInternal2(
|
|
||||||
+ s, size, errors, consumed,
|
|
||||||
+ &first_invalid_escape_char,
|
|
||||||
+ first_invalid_escape);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
PyObject *
|
|
||||||
_PyUnicode_DecodeUnicodeEscapeStateful(const char *s,
|
|
||||||
Py_ssize_t size,
|
|
||||||
const char *errors,
|
|
||||||
Py_ssize_t *consumed)
|
|
||||||
{
|
|
||||||
- const char *first_invalid_escape;
|
|
||||||
- PyObject *result = _PyUnicode_DecodeUnicodeEscapeInternal(s, size, errors,
|
|
||||||
+ int first_invalid_escape_char;
|
|
||||||
+ const char *first_invalid_escape_ptr;
|
|
||||||
+ PyObject *result = _PyUnicode_DecodeUnicodeEscapeInternal2(s, size, errors,
|
|
||||||
consumed,
|
|
||||||
- &first_invalid_escape);
|
|
||||||
+ &first_invalid_escape_char,
|
|
||||||
+ &first_invalid_escape_ptr);
|
|
||||||
if (result == NULL)
|
|
||||||
return NULL;
|
|
||||||
- if (first_invalid_escape != NULL) {
|
|
||||||
- unsigned char c = *first_invalid_escape;
|
|
||||||
- if ('4' <= c && c <= '7') {
|
|
||||||
+ if (first_invalid_escape_char != -1) {
|
|
||||||
+ if (first_invalid_escape_char > 0xff) {
|
|
||||||
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
|
|
||||||
- "invalid octal escape sequence '\\%.3s'",
|
|
||||||
- first_invalid_escape) < 0)
|
|
||||||
+ "invalid octal escape sequence '\\%o'",
|
|
||||||
+ first_invalid_escape_char) < 0)
|
|
||||||
{
|
|
||||||
Py_DECREF(result);
|
|
||||||
return NULL;
|
|
||||||
@@ -6319,7 +6344,7 @@
|
|
||||||
else {
|
|
||||||
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
|
|
||||||
"invalid escape sequence '\\%c'",
|
|
||||||
- c) < 0)
|
|
||||||
+ first_invalid_escape_char) < 0)
|
|
||||||
{
|
|
||||||
Py_DECREF(result);
|
|
||||||
return NULL;
|
|
||||||
Index: Python-3.12.10/Parser/string_parser.c
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Parser/string_parser.c 2025-04-08 11:35:47.000000000 +0000
|
|
||||||
+++ Python-3.12.10/Parser/string_parser.c 2025-05-22 12:38:07.209950694 +0000
|
|
||||||
@@ -181,15 +181,18 @@
|
|
||||||
len = p - buf;
|
|
||||||
s = buf;
|
|
||||||
|
|
||||||
- const char *first_invalid_escape;
|
|
||||||
- v = _PyUnicode_DecodeUnicodeEscapeInternal(s, len, NULL, NULL, &first_invalid_escape);
|
|
||||||
+ int first_invalid_escape_char;
|
|
||||||
+ const char *first_invalid_escape_ptr;
|
|
||||||
+ v = _PyUnicode_DecodeUnicodeEscapeInternal2(s, (Py_ssize_t)len, NULL, NULL,
|
|
||||||
+ &first_invalid_escape_char,
|
|
||||||
+ &first_invalid_escape_ptr);
|
|
||||||
|
|
||||||
// HACK: later we can simply pass the line no, since we don't preserve the tokens
|
|
||||||
// when we are decoding the string but we preserve the line numbers.
|
|
||||||
- if (v != NULL && first_invalid_escape != NULL && t != NULL) {
|
|
||||||
- if (warn_invalid_escape_sequence(parser, s, first_invalid_escape, t) < 0) {
|
|
||||||
- /* We have not decref u before because first_invalid_escape points
|
|
||||||
- inside u. */
|
|
||||||
+ if (v != NULL && first_invalid_escape_ptr != NULL && t != NULL) {
|
|
||||||
+ if (warn_invalid_escape_sequence(parser, s, first_invalid_escape_ptr, t) < 0) {
|
|
||||||
+ /* We have not decref u before because first_invalid_escape_ptr
|
|
||||||
+ points inside u. */
|
|
||||||
Py_XDECREF(u);
|
|
||||||
Py_DECREF(v);
|
|
||||||
return NULL;
|
|
||||||
@@ -202,14 +205,17 @@
|
|
||||||
static PyObject *
|
|
||||||
decode_bytes_with_escapes(Parser *p, const char *s, Py_ssize_t len, Token *t)
|
|
||||||
{
|
|
||||||
- const char *first_invalid_escape;
|
|
||||||
- PyObject *result = _PyBytes_DecodeEscape(s, len, NULL, &first_invalid_escape);
|
|
||||||
+ int first_invalid_escape_char;
|
|
||||||
+ const char *first_invalid_escape_ptr;
|
|
||||||
+ PyObject *result = _PyBytes_DecodeEscape2(s, len, NULL,
|
|
||||||
+ &first_invalid_escape_char,
|
|
||||||
+ &first_invalid_escape_ptr);
|
|
||||||
if (result == NULL) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (first_invalid_escape != NULL) {
|
|
||||||
- if (warn_invalid_escape_sequence(p, s, first_invalid_escape, t) < 0) {
|
|
||||||
+ if (first_invalid_escape_ptr != NULL) {
|
|
||||||
+ if (warn_invalid_escape_sequence(p, s, first_invalid_escape_ptr, t) < 0) {
|
|
||||||
Py_DECREF(result);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:07ab697474595e06f06647417d3c7fa97ded07afc1a7e4454c5639919b46eaea
|
|
||||||
size 20520960
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQKTBAABCgB9FiEEcWlgX2LHUTVtBUomqCHmgOX6YwUFAmf1EjJfFIAAAAAALgAo
|
|
||||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDcx
|
|
||||||
Njk2MDVGNjJDNzUxMzU2RDA1NEEyNkE4MjFFNjgwRTVGQTYzMDUACgkQqCHmgOX6
|
|
||||||
YwXAwBAAncWm4sMrSvGW4bgyp7bHE0CeaA9ErIq55CmHfigrlxPKQUYVlzj38N7H
|
|
||||||
MVlpmqZSQ8wqDFy3gN0QeCXBGapxgO2dEcrgy5HxvtktXge25j1f7LvVraSFB9/F
|
|
||||||
DrOCZr54gVrE/r0242f1JmJQ1BDeMDSUbEYE6fd0xqWYCZ2xpzvYmQG/+6jD5FFC
|
|
||||||
UE6PYxJlq+rfSawj974//BDhrY4hZ3g0xxyiyhfXBBYMhZO3OzCckrAD5zZOQfNE
|
|
||||||
y/JK94nVWXLU/Lx3R+L7TvJgJ3ej4ggq5LRwrn09GU5jExwyITh4yUO7i56vbmvx
|
|
||||||
EtOobQC0RVz/xrsciJ4Gn3zByaO0XPjrGaCOU53nCsNlfJcBQhj2UQpum8CL9S9C
|
|
||||||
BJPCV4jL+Mo8EL91cJTyX4LqFoAXayMwPS0HKVOvYn33+pmVNe+duY/UjUpG50kw
|
|
||||||
jdsHbKAthh8QbSIO0VPk4eH3pVEQ3O9aG+3r/puGjPRWG8CMyLbQUVmlj4Sh3/Kh
|
|
||||||
vh7ydOjzJeuIUhAmFOLLqYG4mah71q1yBXx9jhyxzQSwvyoQaQwgpA+Yn+yB1bXy
|
|
||||||
ttxp2r4fS0ZvGYB44C1WrAxeKRI+J1z19i1IYMc2bV6SfSBoU9AaJqh2o4dMHHUS
|
|
||||||
F3Ko4UTyjU4bTfI18dCs2OgUEED6BAe5cs3ZyqDm3zL4fGIgNXs=
|
|
||||||
=k0VQ
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
File diff suppressed because one or more lines are too long
3
Python-3.12.11.tar.xz
Normal file
3
Python-3.12.11.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:c30bb24b7f1e9a19b11b55a546434f74e739bb4c271a3e3a80ff4380d49f7adb
|
||||||
|
size 20525812
|
||||||
18
Python-3.12.11.tar.xz.asc
Normal file
18
Python-3.12.11.tar.xz.asc
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQKTBAABCgB9FiEEcWlgX2LHUTVtBUomqCHmgOX6YwUFAmg/MbpfFIAAAAAALgAo
|
||||||
|
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDcx
|
||||||
|
Njk2MDVGNjJDNzUxMzU2RDA1NEEyNkE4MjFFNjgwRTVGQTYzMDUACgkQqCHmgOX6
|
||||||
|
YwXySQ/7Ba9qlnTLmxqTCO8C7Gf545WNMBL2Ep6JZPgjOcgNk9e1QdAnNV5OOtGm
|
||||||
|
gW5nNPSTNNcIcPn058GuI24D4RpTQCJfMbMLsfYgvio0E7ij1gC19PsJHb6ejtCS
|
||||||
|
H2kK237Y1kuqRUdbTZssFDoAR4R9+UCaDuo4XdW+UKQk2GgdNQDMWLKmWF/Xk6Ob
|
||||||
|
/LihMXj27mDU9nXVdWR55sJzTFzfGB015vmORvcpuctkf1lZ4AfVFMgGw1CgjRjF
|
||||||
|
kjrOkrDErjDUQ8BIhMh90deiTpigfg7cg1HBDI6GRzklFg6cMfIdfvmfM0MfamX3
|
||||||
|
Tow08TGBzmYXWgrqjYXW6JknKhBGOrjXMB7/yNDk9bJVLcOJaLbOmbcG0WRQF/Py
|
||||||
|
DMOCvr09l0yt5KFYpdKrDvyCuKYfpX33B4C60kU9JzmfXGyQ6LDTPXapZooJ+8Fg
|
||||||
|
GRTUsc0YWXoaDVCcxMIdiG+jEMQkjWVwW7E/nC/d7WT5L9KPoYFA1sZ834kKq3jr
|
||||||
|
NmZynbBnKH7m7L+u6HP6B+pa84FKEME69osAXZk0HJOIHB+SOX3E6BXRo6IV8Q/K
|
||||||
|
J6f5Ja26gJ7KXcUxTgkTkYh7tz0bhb+WeL3j6N/BC0eK7ZVsKRZ/3WnntGsG5B2m
|
||||||
|
FjVOYKolfkF4tf63SjdFuudgaKGCaDK1PvfwIr7k0oozxrB2ZEA=
|
||||||
|
=SYH/
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
1
Python-3.12.11.tar.xz.sigstore
Normal file
1
Python-3.12.11.tar.xz.sigstore
Normal file
File diff suppressed because one or more lines are too long
@@ -3,11 +3,9 @@
|
|||||||
Misc/NEWS | 2 +-
|
Misc/NEWS | 2 +-
|
||||||
2 files changed, 1 insertion(+), 3 deletions(-)
|
2 files changed, 1 insertion(+), 3 deletions(-)
|
||||||
|
|
||||||
Index: Python-3.12.10/Doc/using/configure.rst
|
--- a/Doc/using/configure.rst
|
||||||
===================================================================
|
+++ b/Doc/using/configure.rst
|
||||||
--- Python-3.12.10.orig/Doc/using/configure.rst 2025-04-08 13:35:47.000000000 +0200
|
@@ -640,13 +640,11 @@ macOS Options
|
||||||
+++ Python-3.12.10/Doc/using/configure.rst 2025-04-11 21:16:27.319169087 +0200
|
|
||||||
@@ -640,13 +640,11 @@
|
|
||||||
|
|
||||||
See ``Mac/README.rst``.
|
See ``Mac/README.rst``.
|
||||||
|
|
||||||
@@ -21,11 +19,9 @@ Index: Python-3.12.10/Doc/using/configure.rst
|
|||||||
.. option:: --enable-framework=INSTALLDIR
|
.. option:: --enable-framework=INSTALLDIR
|
||||||
|
|
||||||
Create a Python.framework rather than a traditional Unix install. Optional
|
Create a Python.framework rather than a traditional Unix install. Optional
|
||||||
Index: Python-3.12.10/Misc/NEWS
|
--- a/Misc/NEWS
|
||||||
===================================================================
|
+++ b/Misc/NEWS
|
||||||
--- Python-3.12.10.orig/Misc/NEWS 2025-04-08 13:35:47.000000000 +0200
|
@@ -15146,7 +15146,7 @@ C API
|
||||||
+++ Python-3.12.10/Misc/NEWS 2025-04-11 21:16:27.326169052 +0200
|
|
||||||
@@ -15106,7 +15106,7 @@
|
|
||||||
- bpo-40939: Removed documentation for the removed ``PyParser_*`` C API.
|
- bpo-40939: Removed documentation for the removed ``PyParser_*`` C API.
|
||||||
|
|
||||||
- bpo-43795: The list in :ref:`limited-api-list` now shows the public name
|
- bpo-43795: The list in :ref:`limited-api-list` now shows the public name
|
||||||
|
|||||||
@@ -1,3 +1,33 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 9 19:41:07 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
- Update to 3.12.11:
|
||||||
|
- Security
|
||||||
|
- gh-135034: Fixes multiple issues that allowed tarfile
|
||||||
|
extraction filters (filter="data" and filter="tar") to be
|
||||||
|
bypassed using crafted symlinks and hard links.
|
||||||
|
Addresses CVE-2024-12718 (bsc#1244056), CVE-2025-4138
|
||||||
|
(bsc#1244059), CVE-2025-4330 (bsc#1244060), and
|
||||||
|
CVE-2025-4517 (bsc#1244032).
|
||||||
|
- gh-133767: Fix use-after-free in the “unicode-escape”
|
||||||
|
decoder with a non-“strict” error handler (CVE-2025-4516,
|
||||||
|
bsc#1243273).
|
||||||
|
- gh-128840: Short-circuit the processing of long IPv6
|
||||||
|
addresses early in ipaddress to prevent excessive memory
|
||||||
|
consumption and a minor denial-of-service.
|
||||||
|
- Library
|
||||||
|
- gh-128840: Fix parsing long IPv6 addresses with embedded
|
||||||
|
IPv4 address.
|
||||||
|
- gh-134062: ipaddress: fix collisions in __hash__() for
|
||||||
|
IPv4Network and IPv6Network objects.
|
||||||
|
- gh-123409: Fix ipaddress.IPv6Address.reverse_pointer output
|
||||||
|
according to RFC 3596, §2.5. Patch by Bénédikt Tran.
|
||||||
|
- bpo-43633: Improve the textual representation of
|
||||||
|
IPv4-mapped IPv6 addresses (RFC 4291 Sections 2.2, 2.5.5.2)
|
||||||
|
in ipaddress. Patch by Oleksandr Pavliuk.
|
||||||
|
- Remove upstreamed patches:
|
||||||
|
- CVE-2025-4516-DecodeError-handler.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 16 13:44:12 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
|
Fri May 16 13:44:12 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
|||||||
@@ -118,7 +118,7 @@
|
|||||||
# _md5.cpython-38m-x86_64-linux-gnu.so
|
# _md5.cpython-38m-x86_64-linux-gnu.so
|
||||||
%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so
|
%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so
|
||||||
Name: %{python_pkg_name}%{psuffix}
|
Name: %{python_pkg_name}%{psuffix}
|
||||||
Version: 3.12.10
|
Version: 3.12.11
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Python 3 Interpreter
|
Summary: Python 3 Interpreter
|
||||||
License: Python-2.0
|
License: Python-2.0
|
||||||
@@ -184,9 +184,6 @@ Patch41: docs-docutils_014-Sphinx_420.patch
|
|||||||
# PATCH-FIX-SLE doc-py38-to-py36.patch mcepl@suse.com
|
# PATCH-FIX-SLE doc-py38-to-py36.patch mcepl@suse.com
|
||||||
# Make documentation extensions working with Python 3.6
|
# Make documentation extensions working with Python 3.6
|
||||||
Patch44: doc-py38-to-py36.patch
|
Patch44: doc-py38-to-py36.patch
|
||||||
# PATCH-FIX-UPSTREAM CVE-2025-4516-DecodeError-handler.patch bsc#1243273 mcepl@suse.com
|
|
||||||
# patch from gh#python/cpython!134337
|
|
||||||
Patch45: CVE-2025-4516-DecodeError-handler.patch
|
|
||||||
BuildRequires: autoconf-archive
|
BuildRequires: autoconf-archive
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
|||||||
Reference in New Issue
Block a user