1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #16215: Fix potential double memory free in str.replace().

Browse Source 
Patch by Serhiy Storchaka.
This commit is contained in:
Antoine Pitrou 2012-11-17 23:29:28 +01:00
commit 5439458a2a
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #16215: Fix potential double memory free in str.replace(). Patch
by Serhiy Storchaka.
- Issue #16290: A float return value from the __complex__ special method is no - Issue #16290: A float return value from the __complex__ special method is no
longer accepted in the complex() constructor. longer accepted in the complex() constructor.

2
Objects/unicodeobject.c
View File

@ -9959,6 +9959,7 @@ replace(PyObject *self, PyObject *str1,
/* widen self and buf1 */ /* widen self and buf1 */
rkind = kind2; rkind = kind2;
if (release1) PyMem_Free(buf1); if (release1) PyMem_Free(buf1);
release1 = 0;
sbuf = _PyUnicode_AsKind(self, rkind); sbuf = _PyUnicode_AsKind(self, rkind);
if (!sbuf) goto error; if (!sbuf) goto error;
srelease = 1; srelease = 1;
@ -10020,6 +10021,7 @@ replace(PyObject *self, PyObject *str1,
if (!sbuf) goto error; if (!sbuf) goto error;
srelease = 1; srelease = 1;
if (release1) PyMem_Free(buf1); if (release1) PyMem_Free(buf1);
release1 = 0;
buf1 = _PyUnicode_AsKind(str1, rkind); buf1 = _PyUnicode_AsKind(str1, rkind);
if (!buf1) goto error; if (!buf1) goto error;
release1 = 1; release1 = 1;