Commitebf5459

authored

[3.14]gh-140939: Fix memory leak in_PyBytes_FormatEx error path (GH-140957) (#141154)

(cherry picked from commitd6c89a2)

1 parent5d10409 commitebf5459Copy full SHA for ebf5459

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -802,6 +802,13 @@ def __int__(self):`
`802`	`802`	`withself.assertRaisesRegex(TypeError,msg):`
`803`	`803`	`operator.mod(format_bytes,value)`
`804`	`804`
	`805`	`+deftest_memory_leak_gh_140939(self):`
	`806`	`+# gh-140939: MemoryError is raised without leaking`
	`807`	`+_testcapi=import_helper.import_module('_testcapi')`
	`808`	`+withself.assertRaises(MemoryError):`
	`809`	`+b=self.type2test(b'%*b')`
	`810`	`+b% (_testcapi.PY_SSIZE_T_MAX,b'abc')`
	`811`	`+`
`805`	`812`	`deftest_imod(self):`
`806`	`813`	`b=self.type2test(b'hello, %b!')`
`807`	`814`	`orig=b`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix memory leak when:class:`bytearray` or:class:`bytes` is formated with the
	`2`	+``%*b`` format with a large width that results in a:exc:`MemoryError`.

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -975,8 +975,10 @@ _PyBytes_FormatEx(const char *format, Py_ssize_t format_len,`
`975`	`975`	`/* 2: size preallocated for %s */`
`976`	`976`	`if (alloc>2) {`
`977`	`977`	`res=_PyBytesWriter_Prepare(&writer,res,alloc-2);`
`978`		`-if (res==NULL)`
	`978`	`+if (res==NULL) {`
	`979`	`+Py_XDECREF(temp);`
`979`	`980`	`gotoerror;`
	`981`	`+ }`
`980`	`982`	`}`
`981`	`983`	`#ifndefNDEBUG`
`982`	`984`	`char*before=res;`

Comments

(0)