mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Marc-Andre Lemburg:

Browse source 
Fixed a memory leak found by Fredrik Lundh.  Instead of
PyUnicode_AsUTF8String() we now use _PyUnicode_AsUTF8String() which
returns the string object without incremented refcount (and assures
that the so obtained object remains alive until the Unicode object is
garbage collected).
This commit is contained in:
Guido van Rossum 2000-04-27 20:13:18 +00:00
parent 38c28e379c
commit 700c6ff1fb
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/getargs.c
View file

@ -444,6 +444,11 @@ convertsimple(arg, p_format, p_va, msgbuf)
}
/* Internal API needed by convertsimple1(): */
extern
PyObject *_PyUnicode_AsUTF8String(PyObject *unicode,
const char *errors);
/* Convert a non-tuple argument. Return NULL if conversion went OK,
or a string representing the expected type if the conversion failed.
When failing, an exception may or may not have been raised.
@ -589,7 +594,7 @@ convertsimple1(arg, p_format, p_va)
if (PyString_Check(arg))
*p = PyString_AS_STRING(arg);
else if (PyUnicode_Check(arg)) {
arg = PyUnicode_AsUTF8String(arg);
arg = _PyUnicode_AsUTF8String(arg, NULL);
if (arg == NULL)
return "unicode conversion error";
*p = PyString_AS_STRING(arg);
@ -634,7 +639,7 @@ convertsimple1(arg, p_format, p_va)
else if (PyString_Check(arg))
*p = PyString_AsString(arg);
else if (PyUnicode_Check(arg)) {
arg = PyUnicode_AsUTF8String(arg);
arg = _PyUnicode_AsUTF8String(arg, NULL);
if (arg == NULL)
return "unicode conversion error";
*p = PyString_AS_STRING(arg);