GeezerVison is showing github.com — gh-141370: Fix undefined behavior when using Py_ABS() (GH-141548) · miss-islington/cpython@706fdda
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: Include/pymacro.h +6Lines changed: 6 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 116 | 116 |
| 117 | 117 | /* Absolute value of the number x */ | 118 | 118 | #define Py_ABS(x) ((x) < 0 ? -(x) : (x)) | | 119 | +/* Safer implementation that avoids an undefined behavior for the minimal | | 120 | + value of the signed integer type if its absolute value is larger than | | 121 | + the maximal value of the signed integer type (in the two's complement | | 122 | + representations, which is common). | | 123 | + */ | | 124 | +#define _Py_ABS_CAST(T, x) ((x) >= 0 ? ((T) (x)) : ((T) (((T) -((x) + 1)) + 1u))) | 119 | 125 |
| 120 | 126 | #define _Py_XSTRINGIFY(x) #x | 121 | 127 |
| |
Collapse file Copy file name to clipboardExpand all lines: Lib/test/test_bytes.py +11Lines changed: 11 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -549,6 +549,17 @@ def test_hex_separator_basics(self): | 549 | 549 | self.assertEqual(three_bytes.hex(':', 2), 'b9:01ef') | 550 | 550 | self.assertEqual(three_bytes.hex(':', 1), 'b9:01:ef') | 551 | 551 | self.assertEqual(three_bytes.hex('*', -2), 'b901*ef') | | 552 | + self.assertEqual(three_bytes.hex(sep=':', bytes_per_sep=2), 'b9:01ef') | | 553 | + self.assertEqual(three_bytes.hex(sep='*', bytes_per_sep=-2), 'b901*ef') | | 554 | + for bytes_per_sep in 3, -3, 2**31-1, -(2**31-1): | | 555 | + with self.subTest(bytes_per_sep=bytes_per_sep): | | 556 | + self.assertEqual(three_bytes.hex(':', bytes_per_sep), 'b901ef') | | 557 | + for bytes_per_sep in 2**31, -2**31, 2**1000, -2**1000: | | 558 | + with self.subTest(bytes_per_sep=bytes_per_sep): | | 559 | + try: | | 560 | + self.assertEqual(three_bytes.hex(':', bytes_per_sep), 'b901ef') | | 561 | + except OverflowError: | | 562 | + pass | 552 | 563 |
| 553 | 564 | value = b'{s\005\000\000\000worldi\002\000\000\000s\005\000\000\000helloi\001\000\000\0000' | 554 | 565 | self.assertEqual(value.hex('.', 8), '7b7305000000776f.726c646902000000.730500000068656c.6c6f690100000030') | |
Collapse file Copy file name to clipboardExpand all lines: Lib/test/test_marshal.py +5Lines changed: 5 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -43,6 +43,11 @@ def test_ints(self): | 43 | 43 | for expected in (-n, n): | 44 | 44 | self.helper(expected) | 45 | 45 | n = n >> 1 | | 46 | + n = 1 << 100 | | 47 | + while n: | | 48 | + for expected in (-n, -n+1, n-1, n): | | 49 | + self.helper(expected) | | 50 | + n = n >> 1 | 46 | 51 |
| 47 | 52 | def test_int64(self): | 48 | 53 | # Simulate int marshaling with TYPE_INT64. | |
Collapse file Copy file name to clipboardExpand all lines: Lib/test/test_memoryview.py +19Lines changed: 19 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -600,6 +600,25 @@ def test_memoryview_hex(self): | 600 | 600 | m2 = m1[::-1] | 601 | 601 | self.assertEqual(m2.hex(), '30' * 200000) | 602 | 602 |
| | 603 | + def test_memoryview_hex_separator(self): | | 604 | + x = bytes(range(97, 102)) | | 605 | + m1 = memoryview(x) | | 606 | + m2 = m1[::-1] | | 607 | + self.assertEqual(m2.hex(':'), '65:64:63:62:61') | | 608 | + self.assertEqual(m2.hex(':', 2), '65:6463:6261') | | 609 | + self.assertEqual(m2.hex(':', -2), '6564:6362:61') | | 610 | + self.assertEqual(m2.hex(sep=':', bytes_per_sep=2), '65:6463:6261') | | 611 | + self.assertEqual(m2.hex(sep=':', bytes_per_sep=-2), '6564:6362:61') | | 612 | + for bytes_per_sep in 5, -5, 2**31-1, -(2**31-1): | | 613 | + with self.subTest(bytes_per_sep=bytes_per_sep): | | 614 | + self.assertEqual(m2.hex(':', bytes_per_sep), '6564636261') | | 615 | + for bytes_per_sep in 2**31, -2**31, 2**1000, -2**1000: | | 616 | + with self.subTest(bytes_per_sep=bytes_per_sep): | | 617 | + try: | | 618 | + self.assertEqual(m2.hex(':', bytes_per_sep), '6564636261') | | 619 | + except OverflowError: | | 620 | + pass | | 621 | + | 603 | 622 | def test_copy(self): | 604 | 623 | m = memoryview(b'abc') | 605 | 624 | with self.assertRaises(TypeError): | |
Collapse file Copy file name to clipboardExpand all lines: Python/marshal.c +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -310,7 +310,7 @@ w_PyLong(const PyLongObject *ob, char flag, WFILE *p) | 310 | 310 | } | 311 | 311 | if (!long_export.digits) { | 312 | 312 | int8_t sign = long_export.value < 0 ? -1 : 1; | 313 | | - uint64_t abs_value = Py_ABS(long_export.value); | | 313 | + uint64_t abs_value = _Py_ABS_CAST(uint64_t, long_export.value); | 314 | 314 | uint64_t d = abs_value; | 315 | 315 | long l = 0; | 316 | 316 |
| |
Collapse file Copy file name to clipboardExpand all lines: Python/pystrhex.c +1-2Lines changed: 1 addition & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -42,8 +42,7 @@ static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen, | 42 | 42 | else { | 43 | 43 | bytes_per_sep_group = 0; | 44 | 44 | } | 45 | | - | 46 | | - unsigned int abs_bytes_per_sep = Py_ABS(bytes_per_sep_group); | | 45 | + unsigned int abs_bytes_per_sep = _Py_ABS_CAST(unsigned int, bytes_per_sep_group); | 47 | 46 | Py_ssize_t resultlen = 0; | 48 | 47 | if (bytes_per_sep_group && arglen > 0) { | 49 | 48 | /* How many sep characters we'll be inserting. */ | |
|