projects/guix·blob python-team · refs

157 lines · 5.8 KiB

1Fix CVE-2021-3177 for Python 2.7:
2
3https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3177
4
5Patch copied from Debian:
6
7https://salsa.debian.org/cpython-team/python2/-/blob/e54f3303884f1362f3311ec36f070b40603dd76e/debian/patches/CVE-2021-3177.diff
8
9bpo-42938: Replace snprintf with Python unicode formatting in ctypes param reprs.
10--- a/Lib/ctypes/test/test_parameters.py
11+++ b/Lib/ctypes/test/test_parameters.py
12@@ -206,6 +206,49 @@ class SimpleTypesTestCase(unittest.TestC
13 with self.assertRaises(ZeroDivisionError):
14 WorseStruct().__setstate__({}, b'foo')
15
16+ def test_parameter_repr(self):
17+ from ctypes import (
18+ c_bool,
19+ c_char,
20+ c_wchar,
21+ c_byte,
22+ c_ubyte,
23+ c_short,
24+ c_ushort,
25+ c_int,
26+ c_uint,
27+ c_long,
28+ c_ulong,
29+ c_longlong,
30+ c_ulonglong,
31+ c_float,
32+ c_double,
33+ c_longdouble,
34+ c_char_p,
35+ c_wchar_p,
36+ c_void_p,
37+ )
38+ self.assertRegexpMatches(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$")
39+ self.assertEqual(repr(c_char.from_param('a')), "<cparam 'c' (a)>")
40+ self.assertRegexpMatches(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$")
41+ self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>")
42+ self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>")
43+ self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>")
44+ self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>")
45+ self.assertRegexpMatches(repr(c_int.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
46+ self.assertRegexpMatches(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
47+ self.assertRegexpMatches(repr(c_long.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
48+ self.assertRegexpMatches(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
49+ self.assertRegexpMatches(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' \(20000\)>$")
50+ self.assertRegexpMatches(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' \(20000\)>$")
51+ self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>")
52+ self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>")
53+ self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>")
54+ self.assertRegexpMatches(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' \(1.5\)|'g' at 0x[A-Fa-f0-9]+)>$")
55+ self.assertRegexpMatches(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' \(0x[A-Fa-f0-9]+\)>$")
56+ self.assertRegexpMatches(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' \(0x[A-Fa-f0-9]+\)>$")
57+ self.assertRegexpMatches(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' \(0x0*12\)>$")
58+
59 ################################################################
60
61 if __name__ == '__main__':
62--- a/Modules/_ctypes/callproc.c
63+++ b/Modules/_ctypes/callproc.c
64@@ -460,50 +460,53 @@ PyCArg_dealloc(PyCArgObject *self)
65 static PyObject *
66 PyCArg_repr(PyCArgObject *self)
67 {
68- char buffer[256];
69 switch(self->tag) {
70 case 'b':
71 case 'B':
72- sprintf(buffer, "<cparam '%c' (%d)>",
73+ return PyString_FromFormat("<cparam '%c' (%d)>",
74 self->tag, self->value.b);
75- break;
76 case 'h':
77 case 'H':
78- sprintf(buffer, "<cparam '%c' (%d)>",
79+ return PyString_FromFormat("<cparam '%c' (%d)>",
80 self->tag, self->value.h);
81- break;
82 case 'i':
83 case 'I':
84- sprintf(buffer, "<cparam '%c' (%d)>",
85+ return PyString_FromFormat("<cparam '%c' (%d)>",
86 self->tag, self->value.i);
87- break;
88 case 'l':
89 case 'L':
90- sprintf(buffer, "<cparam '%c' (%ld)>",
91+ return PyString_FromFormat("<cparam '%c' (%ld)>",
92 self->tag, self->value.l);
93- break;
94
95 #ifdef HAVE_LONG_LONG
96 case 'q':
97 case 'Q':
98- sprintf(buffer,
99- "<cparam '%c' (%" PY_FORMAT_LONG_LONG "d)>",
100+ return PyString_FromFormat("<cparam '%c' (%" PY_FORMAT_LONG_LONG "d)>",
101 self->tag, self->value.q);
102- break;
103 #endif
104 case 'd':
105- sprintf(buffer, "<cparam '%c' (%f)>",
106- self->tag, self->value.d);
107- break;
108- case 'f':
109- sprintf(buffer, "<cparam '%c' (%f)>",
110- self->tag, self->value.f);
111- break;
112+ case 'f': {
113+ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d);
114+ if (f == NULL) {
115+ return NULL;
116+ }
117+ PyObject *r = PyObject_Repr(f);
118+ Py_DECREF(f);
119+ if (r == NULL) {
120+ return NULL;
121+ }
122+ char *value = PyString_AsString(r);
123+ if (value == NULL) {
124+ return NULL;
125+ }
126+ PyObject *result = PyString_FromFormat("<cparam '%c' (%s)>", self->tag, value);
127+ Py_DECREF(r);
128+ return result;
129+ }
130
131 case 'c':
132- sprintf(buffer, "<cparam '%c' (%c)>",
133+ return PyString_FromFormat("<cparam '%c' (%c)>",
134 self->tag, self->value.c);
135- break;
136
137 /* Hm, are these 'z' and 'Z' codes useful at all?
138 Shouldn't they be replaced by the functionality of c_string
139@@ -512,16 +515,13 @@ PyCArg_repr(PyCArgObject *self)
140 case 'z':
141 case 'Z':
142 case 'P':
143- sprintf(buffer, "<cparam '%c' (%p)>",
144+ return PyString_FromFormat("<cparam '%c' (%p)>",
145 self->tag, self->value.p);
146- break;
147
148 default:
149- sprintf(buffer, "<cparam '%c' at %p>",
150+ return PyString_FromFormat("<cparam '%c' at %p>",
151 self->tag, self);
152- break;
153 }
154- return PyString_FromString(buffer);
155 }
156
157 static PyMemberDef PyCArgType_members[] = {