Commit46cb634

authored

pythongh-127903: Fix a crash on debug builds when callingObjects/unicodeobject::_copy_characters` (python#127876)

1 parent4c14f03 commit46cb634Copy full SHA for 46cb634

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`"""`
`8`	`8`	`import_string`
`9`	`9`	`importcodecs`
	`10`	`+importdatetime`
`10`	`11`	`importitertools`
`11`	`12`	`importoperator`
`12`	`13`	`importpickle`
`@@ -1908,6 +1909,12 @@ def test_utf8_decode_invalid_sequences(self):`
`1908`	`1909`	`self.assertRaises(UnicodeDecodeError,`
`1909`	`1910`	`(b'\xF4'+cb+b'\xBF\xBF').decode,'utf-8')`
`1910`	`1911`
	`1912`	`+deftest_issue127903(self):`
	`1913`	+# gh-127903: ``_copy_characters`` crashes on DEBUG builds when
	`1914`	`+# there is nothing to copy.`
	`1915`	`+d=datetime.datetime(2013,11,10,14,20,59)`
	`1916`	`+self.assertEqual(d.strftime('%z'),'')`
	`1917`	`+`
`1911`	`1918`	`deftest_issue8271(self):`
`1912`	`1919`	`# Issue #8271: during the decoding of an invalid UTF-8 byte sequence,`
`1913`	`1920`	`# only the start byte and the continuation byte(s) are now considered`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+``Objects/unicodeobject.c``: fix a crash on DEBUG builds in ``_copy_characters``
	`2`	`+when there is nothing to copy.`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1463,11 +1463,14 @@ _copy_characters(PyObject *to, Py_ssize_t to_start,`
`1463`	`1463`	`assert(PyUnicode_Check(from));`
`1464`	`1464`	`assert(from_start+how_many <=PyUnicode_GET_LENGTH(from));`
`1465`	`1465`
`1466`		`-assert(PyUnicode_Check(to));`
`1467`		`-assert(to_start+how_many <=PyUnicode_GET_LENGTH(to));`
	`1466`	`+assert(to==NULL\|\|PyUnicode_Check(to));`
`1468`	`1467`
`1469`		`-if (how_many==0)`
	`1468`	`+if (how_many==0) {`
`1470`	`1469`	`return0;`
	`1470`	`+ }`
	`1471`	`+`
	`1472`	`+assert(to!=NULL);`
	`1473`	`+assert(to_start+how_many <=PyUnicode_GET_LENGTH(to));`
`1471`	`1474`
`1472`	`1475`	`from_kind=PyUnicode_KIND(from);`
`1473`	`1476`	`from_data=PyUnicode_DATA(from);`

Comments

(0)