Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #22453: Warn against the use of leaking macro PyObject_REPR().

This commit is contained in:
Serhiy Storchaka 2014-11-19 00:08:38 +02:00
parent 60fe569673
commit 81f68a7d4b
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Include/object.h
View File

@ -572,8 +572,12 @@ PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *);
PyAPI_FUNC(int) Py_ReprEnter(PyObject *); PyAPI_FUNC(int) Py_ReprEnter(PyObject *);
PyAPI_FUNC(void) Py_ReprLeave(PyObject *); PyAPI_FUNC(void) Py_ReprLeave(PyObject *);
/* Helper for passing objects to printf and the like */ #ifndef Py_LIMITED_API
#define PyObject_REPR(obj) _PyUnicode_AsString(PyObject_Repr(obj)) /* Helper for passing objects to printf and the like.
Leaks refcounts. Don't use it!
*/
#define PyObject_REPR(obj) PyUnicode_AsUTF8(PyObject_Repr(obj))
#endif
/* Flag bits for printing: */ /* Flag bits for printing: */
#define Py_PRINT_RAW 1 /* No string quotes etc. */ #define Py_PRINT_RAW 1 /* No string quotes etc. */

20
Python/compile.c
View File

@ -1412,12 +1412,12 @@ get_ref_type(struct compiler *c, PyObject *name)
PyOS_snprintf(buf, sizeof(buf), PyOS_snprintf(buf, sizeof(buf),
"unknown scope for %.100s in %.100s(%s)\n" "unknown scope for %.100s in %.100s(%s)\n"
"symbols: %s\nlocals: %s\nglobals: %s", "symbols: %s\nlocals: %s\nglobals: %s",
PyBytes_AS_STRING(name), PyUnicode_AsUTF8(name),
PyBytes_AS_STRING(c->u->u_name), PyUnicode_AsUTF8(c->u->u_name),
PyObject_REPR(c->u->u_ste->ste_id), PyUnicode_AsUTF8(PyObject_Repr(c->u->u_ste->ste_id)),
PyObject_REPR(c->u->u_ste->ste_symbols), PyUnicode_AsUTF8(PyObject_Repr(c->u->u_ste->ste_symbols)),
PyObject_REPR(c->u->u_varnames), PyUnicode_AsUTF8(PyObject_Repr(c->u->u_varnames)),
PyObject_REPR(c->u->u_names) PyUnicode_AsUTF8(PyObject_Repr(c->u->u_names))
); );
Py_FatalError(buf); Py_FatalError(buf);
} }
@ -1474,11 +1474,11 @@ compiler_make_closure(struct compiler *c, PyCodeObject *co, Py_ssize_t args, PyO
fprintf(stderr, fprintf(stderr,
"lookup %s in %s %d %d\n" "lookup %s in %s %d %d\n"
"freevars of %s: %s\n", "freevars of %s: %s\n",
PyObject_REPR(name), PyUnicode_AsUTF8(PyObject_Repr(name)),
PyBytes_AS_STRING(c->u->u_name), PyUnicode_AsUTF8(c->u->u_name),
reftype, arg, reftype, arg,
_PyUnicode_AsString(co->co_name), PyUnicode_AsUTF8(co->co_name),
PyObject_REPR(co->co_freevars)); PyUnicode_AsUTF8(PyObject_Repr(co->co_freevars)));
Py_FatalError("compiler_make_closure()"); Py_FatalError("compiler_make_closure()");
} }
ADDOP_I(c, LOAD_CLOSURE, arg); ADDOP_I(c, LOAD_CLOSURE, arg);